fdo#82577: Handle PolyPolygon

Put the TOOLS PolyPolygon class in the tools namespace. Avoids clash with the Windows
PolyPolygon typedef.

Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66

9 files changed, 69 insertions, 69 deletions

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 516e4072f05b..accb763c5faa 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -694,7 +694,7 @@ public:
         @return true, if the operation was completed successfully.
      */
     bool                    Vectorize(
-                                PolyPolygon& rPolyPoly,
+                                tools::PolyPolygon& rPolyPoly,
                                 sal_uLong nFlags = BMP_VECTORIZE_OUTER,
                                 const Link* pProgress = NULL );
 
diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index 774f09ff50e0..08b5b6dba648 100644
--- a/include/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
@@ -31,7 +31,7 @@ class Point;
 class Size;
 class Rectangle;
 class Polygon;
-class PolyPolygon;
+namespace tools { class PolyPolygon; }
 class Bitmap;
 class BitmapEx;
 class Color;
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 414f4306ac8f..5a80213a7550 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -34,7 +34,7 @@ class SvStream;
 class Color;
 class BitmapEx;
 class Polygon;
-class PolyPolygon;
+namespace tools { class PolyPolygon; }
 class Gradient;
 
 
@@ -106,11 +106,11 @@ private:
                                                         const Size& rOffset, double fSin, double fCos );
     SAL_DLLPRIVATE Polygon         ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt,
                                                           const Size& rOffset, double fSin, double fCos );
-    SAL_DLLPRIVATE PolyPolygon     ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt,
+    SAL_DLLPRIVATE tools::PolyPolygon     ImplGetRotatedPolyPolygon( const tools::PolyPolygon& rPoly, const Point& rRotatePt,
                                                               const Size& rOffset, double fSin, double fCos );
     SAL_DLLPRIVATE void            ImplAddGradientEx( GDIMetaFile&          rMtf,
                                                       const OutputDevice&   rMapDev,
-                                                      const PolyPolygon&    rPolyPoly,
+                                                      const tools::PolyPolygon&    rPolyPoly,
                                                       const Gradient&       rGrad       );
     SAL_DLLPRIVATE bool          ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rLogicDestSize );
     SAL_DLLPRIVATE void          ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut );
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index a96ac40d2427..ace82ffa545b 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -83,8 +83,8 @@ public:
         See accessor method descriptions for argument description
      */
     SvtGraphicStroke( const Polygon&        rPath,
-                      const PolyPolygon&    rStartArrow,
-                      const PolyPolygon&    rEndArrow,
+                      const tools::PolyPolygon&    rStartArrow,
+                      const tools::PolyPolygon&    rEndArrow,
                       double                fTransparency,
                       double                fStrokeWidth,
                       CapType               aCap,
@@ -108,7 +108,7 @@ public:
         width, it has to fit every stroke with every stroke width
         exactly.
      */
-    void            getStartArrow       ( PolyPolygon& ) const;
+    void            getStartArrow       ( tools::PolyPolygon& ) const;
     /** Get the polygon that is put at the end of the line
 
         The polygon is in a special normalized position, and already
@@ -122,7 +122,7 @@ public:
         arrow does have this width, it has to fit every stroke with
         every stroke width exactly.
      */
-    void            getEndArrow         ( PolyPolygon& ) const;
+    void            getEndArrow         ( tools::PolyPolygon& ) const;
     /** Get stroke transparency
 
         @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent)
@@ -155,7 +155,7 @@ public:
         arrow does have this width, it will fit every stroke with
         every stroke width exactly.
      */
-    void    setStartArrow       ( const PolyPolygon& );
+    void    setStartArrow       ( const tools::PolyPolygon& );
     /** Set the polygon that is put at the end of the line
 
         The polygon has to be in a special normalized position, and
@@ -169,7 +169,7 @@ public:
         arrow does have this width, it will fit every stroke with
         every stroke width exactly.
      */
-    void    setEndArrow         ( const PolyPolygon& );
+    void    setEndArrow         ( const tools::PolyPolygon& );
     /// Affine scaling in both X and Y dimensions
     void    scale               ( double fScaleX, double fScaleY );
 
@@ -179,8 +179,8 @@ private:
     VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass );
 
     Polygon         maPath;
-    PolyPolygon     maStartArrow;
-    PolyPolygon     maEndArrow;
+    tools::PolyPolygon     maStartArrow;
+    tools::PolyPolygon     maEndArrow;
     double          mfTransparency;
     double          mfStrokeWidth;
     CapType         maCapType;
@@ -281,7 +281,7 @@ public:
 
         See accessor method descriptions for argument description
      */
-    SvtGraphicFill( const PolyPolygon&  rPath,
+    SvtGraphicFill( const tools::PolyPolygon&  rPath,
                     Color               aFillColor,
                     double              fTransparency,
                     FillRule            aFillRule,
@@ -298,7 +298,7 @@ public:
 
     // accessors
     /// Query path to fill
-    void            getPath             ( PolyPolygon& ) const;
+    void            getPath             ( tools::PolyPolygon& ) const;
     /// Get color used for solid fills
     const Color&    getFillColor        () const { return maFillColor;}
     /** Get stroke transparency
@@ -348,14 +348,14 @@ public:
 
     // mutators
     /// Set path to fill
-    void    setPath             ( const PolyPolygon& rPath );
+    void    setPath             ( const tools::PolyPolygon& rPath );
 
 private:
     // friends
     VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass );
     VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicFill( SvStream& rIStm, SvtGraphicFill& rClass );
 
-    PolyPolygon     maPath;
+    tools::PolyPolygon     maPath;
     Color           maFillColor;
     double          mfTransparency;
     FillRule        maFillRule;
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index d98d9ef87e57..1aea53f3a0a4 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -413,7 +413,7 @@ class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
+    tools::PolyPolygon  maPolyPoly;
 
     virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
 
@@ -427,12 +427,12 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
 
-    explicit            MetaPolyPolygonAction( const PolyPolygon& );
+    explicit            MetaPolyPolygonAction( const tools::PolyPolygon& );
 
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
+    const tools::PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
 };
 
 class VCL_DLLPUBLIC MetaTextAction : public MetaAction
@@ -937,7 +937,7 @@ class VCL_DLLPUBLIC MetaGradientExAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
+    tools::PolyPolygon  maPolyPoly;
     Gradient            maGradient;
 
     virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
@@ -952,12 +952,12 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
 
-                        MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
+                        MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient );
 
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
+    const tools::PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
     const Gradient&     GetGradient() const { return maGradient; }
 };
 
@@ -965,7 +965,7 @@ class VCL_DLLPUBLIC MetaHatchAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
+    tools::PolyPolygon  maPolyPoly;
     Hatch               maHatch;
 
     virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
@@ -980,12 +980,12 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
 
-                        MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch );
+                        MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch );
 
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
+    const tools::PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
     const Hatch&        GetHatch() const { return maHatch; }
 };
 
@@ -1410,7 +1410,7 @@ class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
+    tools::PolyPolygon      maPolyPoly;
     sal_uInt16              mnTransPercent;
 
     virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
@@ -1425,12 +1425,12 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
 
-                        MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent );
+                        MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent );
 
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
+    const tools::PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
     sal_uInt16              GetTransparence() const { return mnTransPercent; }
 };
 
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6dc4f076cba7..fd04d9814d7a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -781,14 +781,14 @@ public:
 
         @see DrawPolyLine
      */
-    void                        DrawPolyPolygon( const PolyPolygon& rPolyPoly );
+    void                        DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly );
     void                        DrawPolyPolygon( const basegfx::B2DPolyPolygon& );
 
 private:
 
-    SAL_DLLPRIVATE void         ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly = NULL );
-    SAL_DLLPRIVATE void         ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly = NULL );
-    SAL_DLLPRIVATE void         ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPolyPoly );
+    SAL_DLLPRIVATE void         ImplDrawPolygon( const Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly = NULL );
+    SAL_DLLPRIVATE void         ImplDrawPolyPolygon( const tools::PolyPolygon& rPolyPoly, const tools::PolyPolygon* pClipPolyPoly = NULL );
+    SAL_DLLPRIVATE void         ImplDrawPolyPolygon( sal_uInt16 nPoly, const tools::PolyPolygon& rPolyPoly );
     // #i101491#
     // Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon
     // without MetaFile processing
@@ -825,7 +825,7 @@ public:
 
 public:
     void                        DrawGradient( const Rectangle& rRect, const Gradient& rGradient );
-    void                        DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
+    void                        DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient );
 
     void                        AddGradientActions(
                                     const Rectangle& rRect,
@@ -840,8 +840,8 @@ protected:
 
 private:
 
-    SAL_DLLPRIVATE void         DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
-    SAL_DLLPRIVATE void         DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
+    SAL_DLLPRIVATE void         DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly );
+    SAL_DLLPRIVATE void         DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly );
 
     SAL_DLLPRIVATE long         GetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf, bool bComplex=false );
 
@@ -857,23 +857,23 @@ private:
 public:
 
 #ifdef _MSC_VER
-    void                        DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch );
-    void                        AddHatchActions( const PolyPolygon& rPolyPoly,
+    void                        DrawHatch( const tools::PolyPolygon& rPolyPoly, const ::Hatch& rHatch );
+    void                        AddHatchActions( const tools::PolyPolygon& rPolyPoly,
                                                  const ::Hatch& rHatch,
                                                  GDIMetaFile& rMtf );
 #else
-    void                        DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch );
-    void                        AddHatchActions( const PolyPolygon& rPolyPoly,
+    void                        DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch );
+    void                        AddHatchActions( const tools::PolyPolygon& rPolyPoly,
                                                  const Hatch& rHatch,
                                                  GDIMetaFile& rMtf );
 #endif
 
-    void                        DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf );
+    void                        DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf );
 
 private:
 
     SAL_DLLPRIVATE void         CalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 );
-    SAL_DLLPRIVATE void         DrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf );
+    SAL_DLLPRIVATE void         DrawHatchLine( const Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf );
     ///@}
 
 
@@ -1001,7 +1001,7 @@ public:
 
     Rectangle                   ImplGetTextBoundRect( const SalLayout& );
 
-    bool                        GetTextOutline( PolyPolygon&,
+    bool                        GetTextOutline( tools::PolyPolygon&,
                                                 const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
                                                 sal_Int32 nLen = -1, bool bOptimize = true,
                                                 sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const;
@@ -1156,7 +1156,7 @@ public:
      */
     SystemFontData              GetSysFontData( int nFallbacklevel ) const;
 
-    SAL_DLLPRIVATE void         ImplGetEmphasisMark( PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2,
+    SAL_DLLPRIVATE void         ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2,
                                                      long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient );
     SAL_DLLPRIVATE static FontEmphasisMark
                                 ImplGetEmphasisMarkStyle( const vcl::Font& rFont );
@@ -1216,7 +1216,7 @@ private:
     SAL_DLLPRIVATE OUString     ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr,
                                                        long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
 
-    SAL_DLLPRIVATE void         ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 );
+    SAL_DLLPRIVATE void         ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 );
     SAL_DLLPRIVATE void         ImplDrawEmphasisMarks( SalLayout& );
     ///@}
 
@@ -1512,7 +1512,7 @@ public:
     virtual sal_uInt16          GetAlphaBitCount() const;
 
 
-    void                        DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
+    void                        DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
     void                        DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency);
     void                        DrawTransparent(
                                         const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize,
@@ -1520,12 +1520,12 @@ public:
 
 protected:
 
-    virtual void                EmulateDrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
-    void                        DrawInvisiblePolygon( const PolyPolygon& rPolyPoly );
+    virtual void                EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
+    void                        DrawInvisiblePolygon( const tools::PolyPolygon& rPolyPoly );
 
 private:
 
-    SAL_DLLPRIVATE bool         DrawTransparentNatively( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
+    SAL_DLLPRIVATE bool         DrawTransparentNatively( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
     ///@}
 
 
@@ -1614,7 +1614,7 @@ public:
     Size                        LogicToPixel( const Size& rLogicSize ) const;
     Rectangle                   LogicToPixel( const Rectangle& rLogicRect ) const;
     Polygon                     LogicToPixel( const Polygon& rLogicPoly ) const;
-    PolyPolygon                 LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const;
+    tools::PolyPolygon          LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const;
     basegfx::B2DPolyPolygon     LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const;
     vcl::Region                      LogicToPixel( const vcl::Region& rLogicRegion )const;
     Point                       LogicToPixel( const Point& rLogicPt,
@@ -1627,7 +1627,7 @@ public:
                                               const MapMode& rMapMode ) const;
     basegfx::B2DPolygon         LogicToPixel( const basegfx::B2DPolygon& rLogicPoly,
                                               const MapMode& rMapMode ) const;
-    PolyPolygon                 LogicToPixel( const PolyPolygon& rLogicPolyPoly,
+    tools::PolyPolygon          LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly,
                                               const MapMode& rMapMode ) const;
     basegfx::B2DPolyPolygon     LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
                                               const MapMode& rMapMode ) const;
@@ -1639,7 +1639,7 @@ public:
     Size                        PixelToLogic( const Size& rDeviceSize ) const;
     Rectangle                   PixelToLogic( const Rectangle& rDeviceRect ) const;
     Polygon                     PixelToLogic( const Polygon& rDevicePoly ) const;
-    PolyPolygon                 PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const;
+    tools::PolyPolygon          PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const;
     basegfx::B2DPolyPolygon     PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const;
     vcl::Region                      PixelToLogic( const vcl::Region& rDeviceRegion ) const;
     Point                       PixelToLogic( const Point& rDevicePt,
@@ -1652,7 +1652,7 @@ public:
                                               const MapMode& rMapMode ) const;
     basegfx::B2DPolygon         PixelToLogic( const basegfx::B2DPolygon& rDevicePoly,
                                               const MapMode& rMapMode ) const;
-    PolyPolygon                 PixelToLogic( const PolyPolygon& rDevicePolyPoly,
+    tools::PolyPolygon          PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly,
                                               const MapMode& rMapMode ) const;
     basegfx::B2DPolyPolygon     PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly,
                                               const MapMode& rMapMode ) const;
@@ -1842,7 +1842,7 @@ private:
 
      @returns Polypolygon based on physical device pixel coordinates and units.
      */
-    SAL_DLLPRIVATE PolyPolygon  ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const;
+    SAL_DLLPRIVATE tools::PolyPolygon  ImplLogicToDevicePixel( const tools::PolyPolygon& rLogicPolyPoly ) const;
 
     /** Convert a line in logical units to a line in physical device pixel units.
 
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 56ce18c40052..03211f42aa80 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -48,7 +48,7 @@ class GDIMetaFile;
 class MapMode;
 class Polygon;
 class LineInfo;
-class PolyPolygon;
+namespace tools { class PolyPolygon; }
 class Bitmap;
 class BitmapEx;
 class Image;
@@ -791,7 +791,7 @@ The following structure describes the permissions used in PDF security
                                       const LineInfo& rLineInfo );
     void                DrawPolyLine( const Polygon& rPoly, const ExtLineInfo& rInfo );
     void                DrawPolygon( const Polygon& rPoly );
-    void                DrawPolyPolygon( const PolyPolygon& rPolyPoly );
+    void                DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly );
     void                DrawRect( const Rectangle& rRect );
     void                DrawRect( const Rectangle& rRect,
                                   sal_uLong nHorzRount, sal_uLong nVertRound );
@@ -810,12 +810,12 @@ The following structure describes the permissions used in PDF security
                                       const BitmapEx& rBitmapEx );
 
     void                DrawGradient( const Rectangle& rRect, const Gradient& rGradient );
-    void                DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
+    void                DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient );
 
-    void                DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch );
+    void                DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch );
 
     void                DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper );
-    void                DrawTransparent( const PolyPolygon& rPolyPoly,
+    void                DrawTransparent( const tools::PolyPolygon& rPolyPoly,
                                          sal_uInt16 nTransparencePercent );
 
     /** Start a transparency group
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 6de196c8a6c8..99d781e60f30 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -288,7 +288,7 @@ protected:
                                     const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                     BitmapEx& rBitmapEx ) SAL_OVERRIDE;
 
-    virtual void                EmulateDrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) SAL_OVERRIDE;
+    virtual void                EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) SAL_OVERRIDE;
 
     virtual void                InitFont() const SAL_OVERRIDE;
     virtual void                SetFontOrientation( ImplFontEntry* const pFontEntry ) const SAL_OVERRIDE;
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index f4d2dd31644a..362fa45ee35e 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -29,13 +29,13 @@
 class ImplRegionBand;
 class RegionBand;
 class Polygon;
-class PolyPolygon;
+namespace tools { class PolyPolygon; }
 namespace vcl { class Window; }
 class OutputDevice;
 class Bitmap;
 
 typedef boost::shared_ptr< RegionBand > RegionBandPtr;
-typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr;
+typedef boost::shared_ptr< tools::PolyPolygon > PolyPolygonPtr;
 typedef boost::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr;
 typedef std::vector< Rectangle > RectangleVector;
 
@@ -57,10 +57,10 @@ private:
     bool                        mbIsNull : 1;
 
     // helpers
-    SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly );
+    SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const tools::PolyPolygon& rPolyPoly );
     SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const basegfx::B2DPolyPolygon& rPolyPoly );
 
-    SAL_DLLPRIVATE PolyPolygon ImplCreatePolyPolygonFromRegionBand() const;
+    SAL_DLLPRIVATE tools::PolyPolygon ImplCreatePolyPolygonFromRegionBand() const;
     SAL_DLLPRIVATE basegfx::B2DPolyPolygon ImplCreateB2DPolyPolygonFromRegionBand() const;
 
 public:
@@ -68,19 +68,19 @@ public:
     explicit Region(bool bIsNull = false); // default creates empty region, with true a null region is created
     explicit Region(const Rectangle& rRect);
     explicit Region(const Polygon& rPolygon);
-    explicit Region(const PolyPolygon& rPolyPoly);
+    explicit Region(const tools::PolyPolygon& rPolyPoly);
     explicit Region(const basegfx::B2DPolyPolygon&);
     Region(const vcl::Region& rRegion);
     ~Region();
 
     // direct access to contents
     const basegfx::B2DPolyPolygon* getB2DPolyPolygon() const { return mpB2DPolyPolygon.get(); }
-    const PolyPolygon* getPolyPolygon() const { return mpPolyPolygon.get(); }
+    const tools::PolyPolygon* getPolyPolygon() const { return mpPolyPolygon.get(); }
     const RegionBand* getRegionBand() const { return mpRegionBand.get(); }
 
     // access with converters, the asked data will be created from the most
     // valuable data, buffered and returned
-    const PolyPolygon GetAsPolyPolygon() const;
+    const tools::PolyPolygon GetAsPolyPolygon() const;
     const basegfx::B2DPolyPolygon GetAsB2DPolyPolygon() const;
     const RegionBand* GetAsRegionBand() const;
 
@@ -124,11 +124,11 @@ public:
      * rectangles, then the returned vcl::Region will be constructed by
      * XOr'ing the contained Polygons together; in the case of
      * only Rectangles this can be up to eight times faster than
-     * Region( const PolyPolygon& ).
+     * Region( const tools::PolyPolygon& ).
      * Caution: this is only useful if the vcl::Region is known to be
      * changed to rectangles; e.g. if being set as clip region
      */
-    static vcl::Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly );
+    static vcl::Region GetRegionFromPolyPolygon( const tools::PolyPolygon& rPolyPoly );
 };
 
 } /* namespace vcl */