fdo#82577: Handle PolyPolygon

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

Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66

7 files changed, 20 insertions, 20 deletions

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 8d7032505268..6a207b895a53 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2417,7 +2417,7 @@ namespace
 
                     if(pA->IsClipping())
                     {
-                        // new clipping. Get PolyPolygon and transform with current transformation
+                        // new clipping. Get tools::PolyPolygon and transform with current transformation
                         basegfx::B2DPolyPolygon aNewClipPolyPolygon(getB2DPolyPolygonFromRegion(pA->GetRegion()));
 
                         aNewClipPolyPolygon.transform(rPropertyHolders.Current().getTransformation());
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 3dd582169a5a..e8f5e18bffab 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -266,7 +266,7 @@ namespace drawinglayer
                     for(sal_uInt32 b(0L); b < aAreaPolyPolygon.count(); b++)
                     {
                         // put into single polyPolygon primitives to make clear that this is NOT meant
-                        // to be painted as a single PolyPolygon (XORed as fill rule). Alternatively, a
+                        // to be painted as a single tools::PolyPolygon (XORed as fill rule). Alternatively, a
                         // melting process may be used here one day.
                         const basegfx::B2DPolyPolygon aNewPolyPolygon(aAreaPolyPolygon.getB2DPolygon(b));
                         static bool bTestByUsingRandomColor(false);
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 4cd12f046551..607c4116dafb 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -543,7 +543,7 @@ namespace drawinglayer
                             }
                             else
                             {
-                                OSL_ENSURE(bSamePolygonCount, "Slice PolyPolygon with different Polygon count (!)");
+                                OSL_ENSURE(bSamePolygonCount, "Slice tools::PolyPolygon with different Polygon count (!)");
                                 OSL_ENSURE(bSamePointCount, "Slice Polygon with different point count (!)");
                             }
                         }
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 5e368fba4bf5..14a1a6ec8ed5 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -213,11 +213,11 @@ namespace
         Needed to fix fdo#37559
 
         @param rPoly
-        PolyPolygon to filter
+        tools::PolyPolygon to filter
 
         @return converted tools PolyPolygon, w/o one-point fills
      */
-    PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
+    tools::PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
     {
         // filter input rPoly
         basegfx::B2DPolyPolygon aPoly;
@@ -228,7 +228,7 @@ namespace
             if( !aCandidate.isClosed() || aCandidate.count() > 1 )
                 aPoly.append(aCandidate);
         }
-        return PolyPolygon(aPoly);
+        return tools::PolyPolygon(aPoly);
     }
 
 } // end of anonymous namespace
@@ -521,8 +521,8 @@ namespace drawinglayer
 
                 pRetval = new SvtGraphicStroke(
                     Polygon(aLocalPolygon),
-                    PolyPolygon(aStartArrow),
-                    PolyPolygon(aEndArrow),
+                    tools::PolyPolygon(aStartArrow),
+                    tools::PolyPolygon(aEndArrow),
                     mfCurrentUnifiedTransparence,
                     fLineWidth,
                     eCap,
@@ -590,7 +590,7 @@ namespace drawinglayer
             is rendered by VCL (and thus fragmented to polygon color actions and others). On that base, e.g.
             the Metafile to SdrObject import creates it's gradient objects.
             Best (and safest) way to support it here is to use PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D,
-            map it back to the corresponding tools PolyPolygon and the Gradient and just call
+            map it back to the corresponding tools tools::PolyPolygon and the Gradient and just call
             OutputDevice::DrawGradient which creates the necessary compatible actions.
 
             XPATHFILL_SEQ_BEGIN, XPATHFILL_SEQ_END:
@@ -624,7 +624,7 @@ namespace drawinglayer
             contained path accordingly.
             The other one is SdrObject::Imp_DrawLineGeometry. It's done when MetaFile is set at OutDev and
             only when geometry is a single polygon (!). I see no reason for that; in the PS exporter this
-            would hinder to make use of PolyPolygon strokes. I will need to add support at:
+            would hinder to make use of tools::PolyPolygon strokes. I will need to add support at:
                 PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D
                 PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D
                 PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D
@@ -1541,7 +1541,7 @@ namespace drawinglayer
 
                     // #i111954# do NOT use decomposition, but use direct VCL-command
                     // process(rCandidate.get2DDecomposition(getViewInformation2D()));
-                    const PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
+                    const tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
                     const HatchStyle aHatchStyle(
                         attribute::HATCHSTYLE_SINGLE == rFillHatchAttribute.getStyle() ? HATCH_SINGLE :
                         attribute::HATCHSTYLE_DOUBLE == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE :
@@ -1616,7 +1616,7 @@ namespace drawinglayer
                         // necessary to again remove this subdivision since it decreases possible
                         // printing quality (not even resolution-dependent for now). THB will tell
                         // me when that task is fixed in the master
-                        const PolyPolygon aToolsPolyPolygon(
+                        const tools::PolyPolygon aToolsPolyPolygon(
                             getFillPolyPolygon(
                                 basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon)));
 
@@ -1848,7 +1848,7 @@ namespace drawinglayer
                             // Check also for correct ID to exclude derived implementations
                             if(pPoPoColor && PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D == pPoPoColor->getPrimitive2DID())
                             {
-                                // single transparent PolyPolygon identified, use directly
+                                // single transparent tools::PolyPolygon identified, use directly
                                 const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor()));
                                 basegfx::B2DPolyPolygon aLocalPolyPolygon(pPoPoColor->getB2DPolyPolygon());
 
@@ -1900,7 +1900,7 @@ namespace drawinglayer
                                 }
 
                                 mpOutputDevice->DrawTransparent(
-                                    PolyPolygon(aLocalPolyPolygon),
+                                    tools::PolyPolygon(aLocalPolyPolygon),
                                     nTransPercentVcl);
 
                                 if(bSupportSvtGraphicFill)
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index 1879a64637d5..95ff674980d9 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -95,7 +95,7 @@ namespace drawinglayer
             /// Convert the fWidth to the same space as its coordinates.
             double getTransformedLineWidth( double fWidth ) const;
 
-            /// the current clipping PolyPolygon from MaskPrimitive2D
+            /// the current clipping tools::PolyPolygon from MaskPrimitive2D
             basegfx::B2DPolyPolygon             maClipPolyPolygon;
 
             /// the target MetaFile
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 1a4db9512bd5..79351ce96363 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -782,7 +782,7 @@ namespace drawinglayer
                     }
                     else
                     {
-                        // direct draw of PolyPolygon with color
+                        // direct draw of tools::PolyPolygon with color
                         const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPolyPolygonColorPrimitive2D.getBColor()));
 
                         mpOutputDevice->SetFillColor(Color(aPolygonColor));
@@ -898,7 +898,7 @@ namespace drawinglayer
                                     {
                                         case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D:
                                         {
-                                            // single transparent PolyPolygon identified, use directly
+                                            // single transparent tools::PolyPolygon identified, use directly
                                             const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = static_cast< const primitive2d::PolyPolygonColorPrimitive2D* >(pBasePrimitive);
                                             OSL_ENSURE(pPoPoColor, "OOps, PrimitiveID and PrimitiveType do not match (!)");
                                             bDrawTransparentUsed = tryDrawPolyPolygonColorPrimitive2DDirect(*pPoPoColor, rUniTransparenceCandidate.getTransparence());
@@ -1149,7 +1149,7 @@ namespace drawinglayer
                         ::Hatch aVCLHatch(eHatchStyle, Color(rFillHatchAttributes.getColor()), nDistance, nAngle10);
 
                         // draw hatch using VCL
-                        mpOutputDevice->DrawHatch(PolyPolygon(Polygon(aHatchPolygon)), aVCLHatch);
+                        mpOutputDevice->DrawHatch(tools::PolyPolygon(Polygon(aHatchPolygon)), aVCLHatch);
                     }
                     break;
                 }
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index c05efd3915cc..0f92e6337d73 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -707,7 +707,7 @@ namespace drawinglayer
                                     // a single polygon fill. The form of the fill depends on tiling
                                     if(rFillGraphicAttribute.getTiling())
                                     {
-                                        // with tiling, fill the whole PolyPolygon with the modifier color
+                                        // with tiling, fill the whole tools::PolyPolygon with the modifier color
                                         basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolyPolygon);
 
                                         aLocalPolyPolygon.transform(maCurrentTransformation);
@@ -718,7 +718,7 @@ namespace drawinglayer
                                     else
                                     {
                                         // without tiling, only the area common to the bitmap tile and the
-                                        // PolyPolygon is filled. Create the bitmap tile area in object
+                                        // tools::PolyPolygon is filled. Create the bitmap tile area in object
                                         // coordinates. For this, the object transformation needs to be created
                                         // from the already scaled PolyPolygon. The tile area in object
                                         // coordinates wil always be non-rotated, so it's not necessary to