fdo#82577: Handle PolyPolygon

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

Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66

15 files changed, 72 insertions, 72 deletions

diff --git a/svx/inc/sdr/overlay/overlayhatchrect.hxx b/svx/inc/sdr/overlay/overlayhatchrect.hxx
index d54d0679a3ad..bdceb0b1ca2a 100644
--- a/svx/inc/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/sdr/overlay/overlayhatchrect.hxx
@@ -25,7 +25,7 @@
 
 
 
-class PolyPolygon;
+namespace tools { class PolyPolygon; }
 
 namespace sdr
 {
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index 3d1378aafd3f..e7a4cc72cf40 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -22,7 +22,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <tools/gen.hxx>
 
-class PolyPolygon;
+namespace tools { class PolyPolygon; }
 
 namespace sdr
 {
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index bbe054fbe51e..18dd8d10f9be 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::uno;
 
 struct FWCharacterData                  // representing a single character
 {
-    std::vector< PolyPolygon >          vOutlines;
+    std::vector< tools::PolyPolygon >          vOutlines;
     Rectangle                           aBoundRect;
 };
 struct FWParagraphData                  // representing a single paragraph
@@ -145,7 +145,7 @@ double GetLength( const Polygon& rPolygon )
 /* CalculateHorizontalScalingFactor returns the horizontal scaling factor for
 the whole text object, so that each text will match its corresponding 2d Outline */
 void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
-                                        FWData& rFWData, const PolyPolygon& rOutline2d )
+                                        FWData& rFWData, const tools::PolyPolygon& rOutline2d )
 {
     double fScalingFactor = 1.0;
     bool bScalingFactorDefined = false;
@@ -284,8 +284,8 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                     if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, -1, true, nWidth, pDXArry ) )
                     {
                         sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText);
-                        std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin();
-                        std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterData.vOutlines.end();
+                        std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin();
+                        std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterData.vOutlines.end();
                         if ( aOutlineIter == aOutlineIEnd )
                         {
                             nHeight += rFWData.nSingleLineHeight;
@@ -318,8 +318,8 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                 std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() );
                 while ( aCharacterIter != aCharacterIEnd )
                 {
-                    std::vector< PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() );
-                    std::vector< PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() );
+                    std::vector< tools::PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() );
+                    std::vector< tools::PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() );
                     while ( aOutlineIter != aOutlineIEnd )
                     {
                         aOutlineIter->Move( ( aSingleCharacterUnion.GetWidth() - aCharacterIter->aBoundRect.GetWidth() ) / 2, 0 );
@@ -351,12 +351,12 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
             std::vector< FWCharacterData >::iterator aCharacterIEnd ( aParagraphIter->vCharacters.end() );
             while ( aCharacterIter != aCharacterIEnd )
             {
-                std::vector< PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() );
-                std::vector< PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() );
+                std::vector< tools::PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() );
+                std::vector< tools::PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() );
                 while( aOutlineIter != aOutlineIEnd )
                 {
 
-                    PolyPolygon& rPolyPoly = *aOutlineIter++;
+                    tools::PolyPolygon& rPolyPoly = *aOutlineIter++;
 
                     if ( nVerticalOffset )
                         rPolyPoly.Move( 0, nVerticalOffset );
@@ -387,8 +387,8 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                 std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() );
                 while ( aCharacterIter != aCharacterIEnd )
                 {
-                    std::vector< PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() );
-                    std::vector< PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() );
+                    std::vector< tools::PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() );
+                    std::vector< tools::PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() );
                     while( aOutlineIter != aOutlineIEnd )
                     {
                         Rectangle aPolyPolyBoundRect( aOutlineIter->GetBoundRect() );
@@ -447,8 +447,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape )
                     std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() );
                     while ( aCharacterIter != aCharacterIEnd )
                     {
-                        std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
-                        std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
+                        std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
+                        std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
                         while( aOutlineIter != aOutlineIEnd )
                         {
                             aOutlineIter->Scale( fScale, 1.0 );
@@ -482,8 +482,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape )
                             std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() );
                             while ( aCharacterIter != aCharacterIEnd )
                             {
-                                std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
-                                std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
+                                std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
+                                std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
                                 while( aOutlineIter != aOutlineIEnd )
                                 {
                                     aOutlineIter->Move( nHorzDiff, 0 );
@@ -622,7 +622,7 @@ void GetPoint( const Polygon& rPoly, const std::vector< double >& rDistances, co
     }
 }
 
-void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFWData )
+void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2d, FWData& rFWData )
 {
     std::vector< FWTextArea >::iterator aTextAreaIter = rFWData.vTextAreas.begin();
     std::vector< FWTextArea >::iterator aTextAreaIEnd = rFWData.vTextAreas.end();
@@ -656,11 +656,11 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
                         std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() );
                         while ( aCharacterIter != aCharacterIEnd )
                         {
-                            std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
-                            std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
+                            std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
+                            std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
                             while( aOutlineIter != aOutlineIEnd )
                             {
-                                PolyPolygon& rPolyPoly = *aOutlineIter;
+                                tools::PolyPolygon& rPolyPoly = *aOutlineIter;
                                 Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
                                 double fx1 = aBoundRect.Left() - nLeft;
                                 double fx2 = aBoundRect.Right() - nLeft;
@@ -719,11 +719,11 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
                     std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() );
                     while ( aCharacterIter != aCharacterIEnd )
                     {
-                        std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
-                        std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
+                        std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin();
+                        std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
                         while( aOutlineIter != aOutlineIEnd )
                         {
-                            PolyPolygon& rPolyPoly = *aOutlineIter;
+                            tools::PolyPolygon& rPolyPoly = *aOutlineIter;
                             sal_uInt16 i, nPolyCount = rPolyPoly.Count();
                             for ( i = 0; i < nPolyCount; i++ )
                             {
@@ -792,8 +792,8 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
                 std::vector< FWCharacterData >::const_iterator aCharacterIEnd( aParagraphIter->vCharacters.end() );
                 while ( aCharacterIter != aCharacterIEnd )
                 {
-                    std::vector< PolyPolygon >::const_iterator aOutlineIter = aCharacterIter->vOutlines.begin();
-                    std::vector< PolyPolygon >::const_iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
+                    std::vector< tools::PolyPolygon >::const_iterator aOutlineIter = aCharacterIter->vOutlines.begin();
+                    std::vector< tools::PolyPolygon >::const_iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
                     while( aOutlineIter != aOutlineIEnd )
                     {
                         aPolyPoly.append( aOutlineIter->getB2DPolyPolygon() );
@@ -832,7 +832,7 @@ SdrObject* EnhancedCustomShapeFontWork::CreateFontWork( const SdrObject* pShape2
 {
     SdrObject* pRet = NULL;
 
-    PolyPolygon aOutlines2d( GetOutlinesFromShape2d( pShape2d ) );
+    tools::PolyPolygon aOutlines2d( GetOutlinesFromShape2d( pShape2d ) );
     sal_uInt16 nOutlinesCount2d = aOutlines2d.Count();
     if ( nOutlinesCount2d )
     {
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index c47922d47629..688ed456081c 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -90,7 +90,7 @@ SvxContourDlg::~SvxContourDlg()
 {
 }
 
-PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
+tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
                                               const Rectangle* pRect,
                                               const sal_uIntPtr nFlags )
 {
@@ -166,7 +166,7 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
     aBmp.SetPrefSize( rGraphic.GetPrefSize() );
     aBmp.SetPrefMapMode( rGraphic.GetPrefMapMode() );
 
-    return PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) );
+    return tools::PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) );
 }
 
 // Loop through to super class, no virtual Methods to not become incompatible
@@ -182,7 +182,7 @@ bool SvxContourDlg::IsGraphicChanged() const
     return pSuperClass->IsGraphicChanged();
 }
 
-PolyPolygon SvxContourDlg::GetPolyPolygon()
+tools::PolyPolygon SvxContourDlg::GetPolyPolygon()
 {
     return pSuperClass->GetPolyPolygon( true );
 }
@@ -193,7 +193,7 @@ const void* SvxContourDlg::GetEditingObject() const
 }
 
 void SvxContourDlg::Update( const Graphic& rGraphic, bool bGraphicLinked,
-                            const PolyPolygon* pPolyPoly, void* pEditingObj )
+                            const tools::PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );
 }
@@ -315,11 +315,11 @@ void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic )
     m_pContourWnd->SetGraphic( aGraphic );
 }
 
-void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
+void SvxSuperContourDlg::SetPolyPolygon( const tools::PolyPolygon& rPolyPoly )
 {
     DBG_ASSERT(  m_pContourWnd->GetGraphic().GetType() != GRAPHIC_NONE, "Graphic must've been set first!" );
 
-    PolyPolygon     aPolyPoly( rPolyPoly );
+    tools::PolyPolygon     aPolyPoly( rPolyPoly );
     const MapMode   aMap100( MAP_100TH_MM );
     const MapMode   aGrfMap( aGraphic.GetPrefMapMode() );
     OutputDevice*   pOutDev = Application::GetDefaultDevice();
@@ -344,9 +344,9 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
     m_pContourWnd->GetSdrModel()->SetChanged( true );
 }
 
-PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
+tools::PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
 {
-    PolyPolygon aRetPolyPoly( m_pContourWnd->GetPolyPolygon() );
+    tools::PolyPolygon aRetPolyPoly( m_pContourWnd->GetPolyPolygon() );
 
     if ( bRescaleToGraphic )
     {
@@ -375,7 +375,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
 }
 
 void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicLinked,
-                                 const PolyPolygon* pPolyPoly, void* pEditingObj )
+                                 const tools::PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     aUpdateGraphic = rGraphic;
     bUpdateGraphicLinked = _bGraphicLinked;
@@ -384,7 +384,7 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicL
     if ( pPolyPoly )
         aUpdatePolyPoly = *pPolyPoly;
     else
-        aUpdatePolyPoly = PolyPolygon();
+        aUpdatePolyPoly = tools::PolyPolygon();
 
     aUpdateTimer.Start();
 }
@@ -556,7 +556,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
         bGraphicLinked = bUpdateGraphicLinked;
 
         aUpdateGraphic = Graphic();
-        aUpdatePolyPoly = PolyPolygon();
+        aUpdatePolyPoly = tools::PolyPolygon();
         bUpdateGraphicLinked = false;
 
         m_pContourWnd->GetSdrModel()->SetChanged( false );
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 96a99d3a534b..407dd2fd4df1 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -34,7 +34,7 @@ class SvxSuperContourDlg : public SvxContourDlg
     Graphic             aUndoGraphic;
     Graphic             aRedoGraphic;
     Graphic             aUpdateGraphic;
-    PolyPolygon         aUpdatePolyPoly;
+    tools::PolyPolygon         aUpdatePolyPoly;
     Timer               aUpdateTimer;
     Timer               aCreateTimer;
     Size                aLastSize;
@@ -91,8 +91,8 @@ public:
     const Graphic&      GetGraphic() const { return aGraphic; }
     bool                IsGraphicChanged() const { return nGrfChanged > 0UL; }
 
-    void                SetPolyPolygon( const PolyPolygon& rPolyPoly );
-    PolyPolygon         GetPolyPolygon( bool bRescaleToGraphic = true );
+    void                SetPolyPolygon( const tools::PolyPolygon& rPolyPoly );
+    tools::PolyPolygon         GetPolyPolygon( bool bRescaleToGraphic = true );
 
     void                SetEditingObject( void* pObj ) { pCheckObj = pObj; }
     const void*         GetEditingObject() const { return pCheckObj; }
@@ -101,7 +101,7 @@ public:
     bool                IsRedoPossible() const;
 
     void                UpdateGraphic( const Graphic& rGraphic, bool bGraphicLinked,
-                                const PolyPolygon* pPolyPoly = NULL,
+                                const tools::PolyPolygon* pPolyPoly = NULL,
                                 void* pEditingObj = NULL );
 };
 
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 64a8ae3b2e15..15fc238b438d 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -47,7 +47,7 @@ ContourWindow::~ContourWindow()
 {
 }
 
-void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
+void ContourWindow::SetPolyPolygon( const tools::PolyPolygon& rPolyPoly )
 {
     SdrPage*        pPage = (SdrPage*) pModel->GetPage( 0 );
     const sal_uInt16    nPolyCount = rPolyPoly.Count();
@@ -90,13 +90,13 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
     pModel->SetChanged( false );
 }
 
-const PolyPolygon& ContourWindow::GetPolyPolygon()
+const tools::PolyPolygon& ContourWindow::GetPolyPolygon()
 {
     if ( pModel->IsChanged() )
     {
         SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
 
-        aPolyPoly = PolyPolygon();
+        aPolyPoly = tools::PolyPolygon();
 
         if ( pPage && pPage->GetObjCount() )
         {
@@ -104,7 +104,7 @@ const PolyPolygon& ContourWindow::GetPolyPolygon()
             // Not sure if subdivision is needed for ContourWindow, but maybe it cannot handle
             // curves at all. Keeping subdivision here for security
             const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(pPathObj->GetPathPoly()));
-            aPolyPoly = PolyPolygon(aB2DPolyPolygon);
+            aPolyPoly = tools::PolyPolygon(aB2DPolyPolygon);
         }
 
         pModel->SetChanged( false );
@@ -148,7 +148,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
     {
         const Point aLogPt( PixelToLogic( rMEvt.GetPosPixel() ) );
 
-        SetPolyPolygon( PolyPolygon() );
+        SetPolyPolygon( tools::PolyPolygon() );
         aWorkRect = Rectangle( aLogPt, aLogPt );
         Paint( Rectangle( Point(), GetGraphicSize() ) );
         SetEditMode( true );
@@ -206,7 +206,7 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt)
 
         if ( aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom() )
         {
-            PolyPolygon _aPolyPoly( GetPolyPolygon() );
+            tools::PolyPolygon _aPolyPoly( GetPolyPolygon() );
 
             _aPolyPoly.Clip( aWorkRect );
             SetPolyPolygon( _aPolyPoly );
@@ -249,7 +249,7 @@ void ContourWindow::Paint( const Rectangle& rRect )
 
     if ( aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom() )
     {
-        PolyPolygon _aPolyPoly( 2, 2 );
+        tools::PolyPolygon _aPolyPoly( 2, 2 );
         const Color aOldFillColor( GetFillColor() );
 
         _aPolyPoly.Insert( Rectangle( Point(), GetGraphicSize() ) );
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 63d68ff82543..2bbf9a6f2feb 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -25,7 +25,7 @@
 
 class ContourWindow : public GraphCtrl
 {
-    PolyPolygon         aPolyPoly;
+    tools::PolyPolygon         aPolyPoly;
     Color               aPipetteColor;
     Rectangle           aWorkRect;
     Link                aPipetteLink;
@@ -52,8 +52,8 @@ public:
     ContourWindow(vcl::Window* pParent, WinBits nBits);
     virtual ~ContourWindow();
 
-    void                SetPolyPolygon( const PolyPolygon& rPolyPoly );
-    const PolyPolygon&  GetPolyPolygon();
+    void                SetPolyPolygon( const tools::PolyPolygon& rPolyPoly );
+    const tools::PolyPolygon&  GetPolyPolygon();
 
     void                SetPipetteMode( const bool bPipette ) { bPipetteMode = bPipette; }
     bool                IsPipetteMode() const { return bPipetteMode; }
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index aa7f8ca434d2..86772cefb6db 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -100,9 +100,9 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder )
 }
 
 /** Merges the rSource polypolygon into the rDest polypolygon. */
-inline void lclPolyPolyUnion( PolyPolygon& rDest, const PolyPolygon& rSource )
+inline void lclPolyPolyUnion( tools::PolyPolygon& rDest, const tools::PolyPolygon& rSource )
 {
-    const PolyPolygon aTmp( rDest );
+    const tools::PolyPolygon aTmp( rDest );
     aTmp.GetUnion( rSource, rDest );
 }
 
@@ -163,7 +163,7 @@ void FrameBorder::AddFocusPolygon( const Polygon& rFocus )
     lclPolyPolyUnion( maFocusArea, rFocus );
 }
 
-void FrameBorder::MergeFocusToPolyPolygon( PolyPolygon& rPPoly ) const
+void FrameBorder::MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const
 {
     lclPolyPolyUnion( rPPoly, maFocusArea );
 }
@@ -528,7 +528,7 @@ void FrameSelectorImpl::DrawBackground()
         mnLine1 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine3 + mnFocusOffs ) );
 
     // draw the white space for enabled frame borders
-    PolyPolygon aPPoly;
+    tools::PolyPolygon aPPoly;
     for( FrameBorderCIter aIt( maEnabBorders ); aIt.Is(); ++aIt )
         (*aIt)->MergeFocusToPolyPolygon( aPPoly );
     aPPoly.Optimize( POLY_OPTIMIZE_CLOSE );
@@ -676,7 +676,7 @@ void FrameSelectorImpl::CopyVirDevToControl()
 
 void FrameSelectorImpl::DrawAllTrackingRects()
 {
-    PolyPolygon aPPoly;
+    tools::PolyPolygon aPPoly;
     if( mrFrameSel.IsAnyBorderSelected() )
     {
         for( SelFrameBorderCIter aIt( maEnabBorders ); aIt.Is(); ++aIt )
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index fbab7730d9f0..3769117dd678 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -56,7 +56,7 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties()
 
 TYPEINIT1(E3dExtrudeObj, E3dCompoundObject);
 
-// Constructor creates a two cover surface PolyPolygon and (point-count 1) side
+// Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side
 // surfaces rectangles from the passed PolyPolygon
 
 E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth)
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index dd5084252335..b8d960b0949d 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -63,7 +63,7 @@ void E3dPolygonObj::CreateDefaultNormals()
 {
     basegfx::B3DPolyPolygon aPolyNormals;
 
-    // Create a complete PolyPolygon with the plane normal
+    // Create a complete tools::PolyPolygon with the plane normal
     for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++)
     {
         // Find source polygon
@@ -92,7 +92,7 @@ void E3dPolygonObj::CreateDefaultNormals()
 void E3dPolygonObj::CreateDefaultTexture()
 {
     basegfx::B2DPolyPolygon aPolyTexture;
-    // Create a complete PolyPolygon with the texture coordinates
+    // Create a complete tools::PolyPolygon with the texture coordinates
     // The texture coordinates extend over X,Y and Z
     // on the whole extreme values in the range 0.0 .. 1.0
     for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++)
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 33b3f510d749..702b2c4b2326 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -58,7 +58,7 @@ public:
 
     inline void         ClearFocusArea() { maFocusArea.Clear(); }
     void                AddFocusPolygon( const Polygon& rFocus );
-    void                MergeFocusToPolyPolygon( PolyPolygon& rPPoly ) const;
+    void                MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const;
 
     inline void         ClearClickArea() { maClickArea.Clear(); }
     void                AddClickRect( const Rectangle& rRect );
@@ -79,8 +79,8 @@ private:
     FrameBorderType     meKeyRight;     /// Right neighbor for keyboard control.
     FrameBorderType     meKeyTop;       /// Upper neighbor for keyboard control.
     FrameBorderType     meKeyBottom;    /// Lower neighbor for keyboard control.
-    PolyPolygon         maFocusArea;    /// Focus drawing areas.
-    PolyPolygon         maClickArea;    /// Mouse click areas.
+    tools::PolyPolygon         maFocusArea;    /// Focus drawing areas.
+    tools::PolyPolygon         maClickArea;    /// Mouse click areas.
     bool                mbEnabled;      /// true = Border enabled in control.
     bool                mbSelected;     /// true = Border selected in control.
 };
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 81ad4d8bd0d7..b102d42a15a3 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1376,7 +1376,7 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon,
 bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const
 {
     bool bOtherObjs(false);    // true=objects other than PathObj's existent
-    bool bMin1PolyPoly(false); // true=at least 1 PolyPolygon with more than one Polygon existent
+    bool bMin1PolyPoly(false); // true=at least 1 tools::PolyPolygon with more than one Polygon existent
     SdrObjList* pOL = pObj->GetSubList();
 
     if(pOL)
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 76539b6f064b..2e2c039052e7 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1250,7 +1250,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
             if(nSize > 1)
             {
                 // the topology for contour is correctly a vector of PolyPolygons; for
-                // historical reasons cut it back to a single PolyPolygon here
+                // historical reasons cut it back to a single tools::PolyPolygon here
                 for(sal_uInt32 a(0); a < nSize; a++)
                 {
                     aRetval.append(rResult[a]);
@@ -2528,7 +2528,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
             // check for fill rsults
             if(!aExtractedLineFills.empty())
             {
-                // merge to a single PolyPolygon (OR)
+                // merge to a single tools::PolyPolygon (OR)
                 aMergedLineFillPolyPolygon = basegfx::tools::mergeToSinglePolyPolygon(aExtractedLineFills);
             }
         }
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index fcd5b0a5a7d6..2d9394db6b2c 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -484,7 +484,7 @@ bool SdrPolyEditView::IsOpenCloseMarkedObjectsPossible() const
         {
             // #i76617# Do not yet use basegfx::B2DPolygon since curve definitions
             // are different and methods need to be changed thoroughly with interaction rework
-            const PolyPolygon aPathPolyPolygon(pMarkedPathObject->GetPathPoly());
+            const tools::PolyPolygon aPathPolyPolygon(pMarkedPathObject->GetPathPoly());
             const sal_uInt16 nPolygonCount(aPathPolyPolygon.Count());
 
             for(sal_uInt16 b(0); !bRetval && b < nPolygonCount; b++)
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index c963981800db..a3b791e693c0 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1170,7 +1170,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
     {
     case OWN_ATTR_VALUE_POLYPOLYGON:
     {
-        // PolyPolygon in eine struct PolyPolygon packen
+        // tools::PolyPolygon in eine struct tools::PolyPolygon packen
         const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
         drawing::PointSequenceSequence aRetval( rPolyPoly.count() );
 
@@ -1181,7 +1181,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
     }
     case OWN_ATTR_BASE_GEOMETRY:
     {
-        // pack a PolyPolygon in struct PolyPolygon
+        // pack a tools::PolyPolygon in struct PolyPolygon
         basegfx::B2DPolyPolygon aNewPolyPolygon;
         basegfx::B2DHomMatrix aNewHomogenMatrix;
 
@@ -1195,7 +1195,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
     }
     case OWN_ATTR_VALUE_POLYGON:
     {
-        // PolyPolygon in eine struct PolyPolygon packen
+        // tools::PolyPolygon in eine struct tools::PolyPolygon packen
         const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
 
         sal_Int32 nCount = 0;
@@ -1331,7 +1331,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
     {
     case OWN_ATTR_VALUE_POLYPOLYGONBEZIER:
     {
-        // PolyPolygon in eine struct PolyPolygon packen
+        // tools::PolyPolygon in eine struct tools::PolyPolygon packen
         const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
         drawing::PolyPolygonBezierCoords aRetval;
         basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(rPolyPoly, aRetval);
@@ -1341,7 +1341,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
     }
     case OWN_ATTR_BASE_GEOMETRY:
     {
-        // PolyPolygon in eine struct PolyPolygon packen
+        // tools::PolyPolygon in eine struct tools::PolyPolygon packen
         basegfx::B2DPolyPolygon aNewPolyPolygon;
         basegfx::B2DHomMatrix aNewHomogenMatrix;
         mpObj.get()->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);