Tag: cws_src680_presfixes12
User: thb
Date: 2007/02/21 07:04:08
Modified:
gsl/cppcanvas/source/mtfrenderer/lineaction.cxx
Log:
RESYNC: (1.9-1.10); FILE MERGED
File Changes:
Directory: /gsl/cppcanvas/source/mtfrenderer/
=============================================
File [changed]: lineaction.cxx
Url:
http://gsl.openoffice.org/source/browse/gsl/cppcanvas/source/mtfrenderer/lineaction.cxx?r1=1.9.22.1&r2=1.9.22.2
Delta lines: +20 -21
---------------------
--- lineaction.cxx 20 Feb 2007 22:29:27 -0000 1.9.22.1
+++ lineaction.cxx 21 Feb 2007 15:04:06 -0000 1.9.22.2
@@ -46,6 +46,7 @@
#include <vcl/canvastools.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <canvas/canvastools.hxx>
@@ -67,8 +68,8 @@
class LineAction : public Action, private ::boost::noncopyable
{
public:
- LineAction( const ::Point&,
- const ::Point&,
+ LineAction( const ::basegfx::B2DPoint&,
+ const ::basegfx::B2DPoint&,
const CanvasSharedPtr&,
const OutDevState& );
@@ -83,14 +84,14 @@
virtual sal_Int32 getActionCount() const;
private:
- Point maStartPoint;
- Point maEndPoint;
+ ::basegfx::B2DPoint maStartPoint;
+ ::basegfx::B2DPoint maEndPoint;
CanvasSharedPtr mpCanvas;
rendering::RenderState maState;
};
- LineAction::LineAction( const ::Point&
rStartPoint,
- const ::Point&
rEndPoint,
+ LineAction::LineAction( const ::basegfx::B2DPoint& rStartPoint,
+ const ::basegfx::B2DPoint& rEndPoint,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState
) :
maStartPoint( rStartPoint ),
@@ -110,8 +111,8 @@
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState,
rTransformation);
- mpCanvas->getUNOCanvas()->drawLine(
::vcl::unotools::point2DFromPoint(maStartPoint),
-
::vcl::unotools::point2DFromPoint(maEndPoint),
+ mpCanvas->getUNOCanvas()->drawLine(
::basegfx::unotools::point2DFromB2DPoint(maStartPoint),
+
::basegfx::unotools::point2DFromB2DPoint(maEndPoint),
mpCanvas->getViewState(),
aLocalState );
@@ -135,10 +136,8 @@
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds( ::basegfx::B2DRange(
maStartPoint.X(),
-
maStartPoint.Y(),
-
maEndPoint.X(),
-
maEndPoint.Y() ),
+ return tools::calcDevicePixelBounds( ::basegfx::B2DRange(
maStartPoint,
+
maEndPoint ),
mpCanvas->getViewState(),
aLocalState );
}
@@ -161,8 +160,8 @@
}
}
- ActionSharedPtr LineActionFactory::createLineAction( const ::Point&
rStartPoint,
- const ::Point&
rEndPoint,
+ ActionSharedPtr LineActionFactory::createLineAction( const
::basegfx::B2DPoint& rStartPoint,
+ const
::basegfx::B2DPoint& rEndPoint,
const
CanvasSharedPtr& rCanvas,
const
OutDevState& rState )
{
|
