INTEGRATION: CWS thbpp6 (1.6.44); FILE MERGED

2006/12/21 17:20:54 thb 1.6.44.1: #121806# Now keeping full precision of the mtf logic coordinates across mtf->XCanvas conversion

2 files changed, 17 insertions, 14 deletions

diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index 762a2805f05a..ad9ba2f0ab46 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pointaction.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 08:21:14 $
+ *  last change: $Author: obo $ $Date: 2007-01-22 11:51:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,9 +39,10 @@
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
 
-class Point;
 class Color;
-
+namespace basegfx {
+    class B2DPoint;
+}
 
 /* Definition of internal::PointActionFactory class */
 
@@ -62,12 +63,12 @@ namespace cppcanvas
         {
         public:
             /// Point in current color
-            static ActionSharedPtr createPointAction( const ::Point&,
+            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
                                                       const CanvasSharedPtr&,
                                                       const OutDevState& );
 
             /// Point in given color
-            static ActionSharedPtr createPointAction( const ::Point&,
+            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
                                                       const CanvasSharedPtr&,
                                                       const OutDevState&,
                                                       const ::Color&        );
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index df89bf2f94f5..d96960fbb5a1 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: polypolyaction.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 08:21:51 $
+ *  last change: $Author: obo $ $Date: 2007-01-22 11:51:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,8 +39,10 @@
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
 
-class PolyPolygon;
 
+namespace basegfx {
+    class B2DPolyPolygon;
+}
 namespace com { namespace sun { namespace star { namespace rendering
 {
     struct Texture;
@@ -67,29 +69,29 @@ namespace cppcanvas
         {
         public:
             /// Create polygon, fill/stroke according to state
-            static ActionSharedPtr createPolyPolyAction( const ::PolyPolygon&,
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&     );
 
             /// Create texture-filled polygon
-            static ActionSharedPtr createPolyPolyAction( const ::PolyPolygon&,
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
                                                          const ::com::sun::star::rendering::Texture& );
 
             /// Create line polygon (always stroked, not filled)
-            static ActionSharedPtr createLinePolyPolyAction( const ::PolyPolygon&,
+            static ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                              const CanvasSharedPtr&,
                                                              const OutDevState& );
 
             /// Create stroked polygon
-            static ActionSharedPtr createPolyPolyAction( const ::PolyPolygon&,
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
                                                          const ::com::sun::star::rendering::StrokeAttributes& );
 
             /// For transparent painting of the given polygon (normally, we take the colors always opaque)
-            static ActionSharedPtr createPolyPolyAction( const ::PolyPolygon&,
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
                                                          int nTransparency );