Put Polygon from tools under tools:: namespace

Polygon is one of these names that Clash with some system objects
A similar work has been done earlier with PolyPolygon.

Change-Id: Icf2217cb2906292b7275760f1a16be0e150312f5
Reviewed-on: https://gerrit.libreoffice.org/17789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

11 files changed, 28 insertions, 29 deletions

diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 4b3bb7391927..9d1f2a54a484 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2930,7 +2930,7 @@ void SvxIconChoiceCtrl_Impl::DrawFocusRect(vcl::RenderContext& rRenderContext)
 {
     rRenderContext.SetLineColor(aFocus.aPenColor);
     rRenderContext.SetFillColor();
-    Polygon aPolygon (aFocus.aRect);
+    tools::Polygon aPolygon (aFocus.aRect);
 
     LineInfo aLineInfo(LINE_DASH);
 
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 2d017bd20b63..4dcc834351a2 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -794,7 +794,7 @@ void Ruler::ImplDrawBorders(vcl::RenderContext& rRenderContext, long nMin, long
     }
 }
 
-void Ruler::ImplDrawIndent(vcl::RenderContext& rRenderContext, const Polygon& rPoly, sal_uInt16 nStyle, bool bIsHit)
+void Ruler::ImplDrawIndent(vcl::RenderContext& rRenderContext, const tools::Polygon& rPoly, sal_uInt16 nStyle, bool bIsHit)
 {
     const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
 
@@ -813,7 +813,7 @@ void Ruler::ImplDrawIndents(vcl::RenderContext& rRenderContext, long nMin, long
     long nIndentHeight = (mnVirHeight / 2) - 1;
     long nIndentWidth2 = nIndentHeight-3;
 
-    Polygon aPoly(5);
+    tools::Polygon aPoly(5);
 
     for (j = 0; j < mpData->pIndents.size(); j++)
     {
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 2e00b94413c8..a4cfe4e2d340 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2460,7 +2460,7 @@ sal_uInt16 TabBar::ShowDropPos(const Point& rPos)
             SetFillColor(pItem->maTabTextColor);
         }
 
-        Polygon aPoly(3);
+        tools::Polygon aPoly(3);
         aPoly.SetPoint(Point(nX, nY), 0);
         aPoly.SetPoint(Point(nX + nTriangleWidth, nY - nTriangleWidth), 1);
         aPoly.SetPoint(Point(nX + nTriangleWidth, nY + nTriangleWidth), 2);
@@ -2480,7 +2480,7 @@ sal_uInt16 TabBar::ShowDropPos(const Point& rPos)
             SetLineColor(pItem->maTabTextColor);
             SetFillColor(pItem->maTabTextColor);
         }
-        Polygon aPoly(3);
+        tools::Polygon aPoly(3);
         aPoly.SetPoint(Point(nX, nY), 0);
         aPoly.SetPoint(Point(nX - nTriangleWidth, nY - nTriangleWidth), 1);
         aPoly.SetPoint(Point(nX - nTriangleWidth, nY + nTriangleWidth), 2);
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index d34c5b7ba6fd..c7b573e772fb 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -794,7 +794,7 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const
     {
         if( maAttr.IsRotated() )
         {
-            Polygon aPoly( Rectangle( rPt, rSz ) );
+            tools::Polygon aPoly( Rectangle( rPt, rSz ) );
 
             aPoly.Rotate( rPt, maAttr.GetRotation() % 3600 );
             const Rectangle aRotBoundRect( aPoly.GetBoundRect() );
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index a36a3f80ddee..e97cb750f8a0 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -270,8 +270,8 @@ bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
 
     if( GetType() != GRAPHIC_NONE )
     {
-        Polygon         aClipPoly( Rectangle( rPt, rSz ) );
-        const sal_uInt16    nRot10 = pAttr->GetRotation() % 3600;
+        tools::Polygon aClipPoly( Rectangle( rPt, rSz ) );
+        const sal_uInt16 nRot10 = pAttr->GetRotation() % 3600;
         const Point     aOldOrigin( rPt );
         const MapMode   aMap100( MAP_100TH_MM );
         Size            aSize100;
@@ -318,7 +318,7 @@ bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
 
             if( nRot10 )
             {
-                Polygon aOriginPoly( 1 );
+                tools::Polygon aOriginPoly( 1 );
 
                 aOriginPoly[ 0 ] = rPt;
                 aOriginPoly.Rotate( aOldOrigin, nRot10 );
@@ -481,7 +481,7 @@ bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size&
         if ( pAttr && pAttr->IsCropped() )
         {
             tools::PolyPolygon aClipPolyPoly;
-            bool        bRectClip;
+            bool bRectClip;
             ImplGetCropParams( pOut, aPt, aSz, pAttr, aClipPolyPoly, bRectClip );
         }
         bRet = mpMgr->IsInCache( pOut, aPt, aSz, *this, ( pAttr ? *pAttr : GetAttr() ) );
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 986f89414c05..7bd27f5863cd 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -116,7 +116,7 @@ bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size&
 
                 if( nRot10 )
                 {
-                    Polygon aPoly( Rectangle( aPt, aSz ) );
+                    tools::Polygon aPoly( Rectangle( aPt, aSz ) );
 
                     aPoly.Rotate( aPt, nRot10 );
                     const Rectangle aRotBoundRect( aPoly.GetBoundRect() );
@@ -439,7 +439,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib
     sal_uInt8           cR0, cG0, cB0, cR1, cG1, cB1;
     bool                bRet = false;
 
-    Polygon             aPoly( Rectangle( Point(), rUnrotatedSzPix ) );
+    tools::Polygon aPoly( Rectangle( Point(), rUnrotatedSzPix ) );
     aPoly.Rotate( Point(), nRot10 );
     Rectangle           aNewBound( aPoly.GetBoundRect() );
 
@@ -883,7 +883,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
 
     if( nRot10 )
     {
-        Polygon aPoly( Rectangle( rPoint, rSize ) );
+        tools::Polygon aPoly( Rectangle( rPoint, rSize ) );
         aPoly.Rotate( rPoint, nRot10 );
         const Rectangle aRotBoundRect( aPoly.GetBoundRect() );
         aOutputPointPix = pOutputDevice->LogicToPixel( aRotBoundRect.TopLeft() );
@@ -1611,7 +1611,7 @@ void GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size&
 
     if( nRot10 )
     {
-        Polygon aPoly( Rectangle( aOutPt, aOutSz ) );
+        tools::Polygon aPoly( Rectangle( aOutPt, aOutSz ) );
 
         aPoly.Rotate( aOutPt, nRot10 );
         const Rectangle aRotBoundRect( aPoly.GetBoundRect() );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 581d3ee276f2..2b7ff4bc8f64 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -378,7 +378,7 @@ bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
              ( nRadius == rEqObj.nRadius ) );
 }
 
-IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
+IMapPolygonObject::IMapPolygonObject( const tools::Polygon& rPoly,
                                       const OUString& rURL,
                                       const OUString& rAltText,
                                       const OUString& rDesc,
@@ -392,7 +392,7 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
     ImpConstruct( rPoly, bPixelCoords );
 }
 
-void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, bool bPixel )
+void IMapPolygonObject::ImpConstruct( const tools::Polygon& rPoly, bool bPixel )
 {
     if ( bPixel )
         aPoly = Application::GetDefaultDevice()->PixelToLogic( rPoly, MapMode( MAP_100TH_MM ) );
@@ -457,9 +457,9 @@ bool IMapPolygonObject::IsHit( const Point& rPoint ) const
     return aPoly.IsInside( rPoint );
 }
 
-Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const
+tools::Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const
 {
-    Polygon aNewPoly;
+    tools::Polygon aNewPoly;
 
     if ( bPixelCoords )
         aNewPoly = Application::GetDefaultDevice()->LogicToPixel( aPoly, MapMode( MAP_100TH_MM ) );
@@ -515,7 +515,7 @@ bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
 
     if ( IMapObject::IsEqual( rEqObj ) )
     {
-        const Polygon&   rEqPoly = rEqObj.aPoly;
+        const tools::Polygon&   rEqPoly = rEqObj.aPoly;
         const sal_uInt16 nCount = aPoly.GetSize();
         const sal_uInt16 nEqCount = rEqPoly.GetSize();
 
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index b88cd658763f..b9fb6ca032e1 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -286,10 +286,9 @@ void ImageMap::ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL
         }
         else if ( ( aToken == "polygon" ) || ( aToken == "poly" ) )
         {
-            const sal_uInt16 nCount = comphelper::string::getTokenCount(aStr,
-                '(') - 1;
-            Polygon         aPoly( nCount );
-            OUString        aURL;
+            const sal_uInt16 nCount = comphelper::string::getTokenCount(aStr, '(') - 1;
+            tools::Polygon aPoly( nCount );
+            OUString aURL;
 
             for ( sal_uInt16 i = 0; i < nCount; i++ )
                 aPoly[ i ] = ImpReadCERNCoords( &pStr );
@@ -432,8 +431,8 @@ void ImageMap::ImpReadNCSALine( const OString& rLine, const OUString& rBaseURL )
         {
             const sal_uInt16 nCount = comphelper::string::getTokenCount(aStr,
                 ',') - 1;
-            const OUString  aURL( ImpReadNCSAURL( &pStr, rBaseURL ) );
-            Polygon         aPoly( nCount );
+            const OUString aURL( ImpReadNCSAURL( &pStr, rBaseURL ) );
+            tools::Polygon aPoly( nCount );
 
             for ( sal_uInt16 i = 0; i < nCount; i++ )
                 aPoly[ i ] = ImpReadNCSACoords( &pStr );
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index b79fcd97ec1d..9be535c0f2d1 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -680,7 +680,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                     const IMapPolygonObject* pPolyObj =
                         static_cast<const IMapPolygonObject *>(pObj);
                     pShape= OOO_STRING_SVTOOLS_HTML_SH_poly;
-                    Polygon aPoly( pPolyObj->GetPolygon() );
+                    tools::Polygon aPoly( pPolyObj->GetPolygon() );
                     sal_uInt16 nCount = aPoly.GetSize();
                     OStringBuffer aTmpBuf;
                     if( nCount>0 )
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index e94da73ef89f..357849bda502 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -210,7 +210,7 @@ namespace svt
             aDottedStyle.SetDistance( 1 );
 
             m_pPaintDevice->SetLineColor( COL_BLACK );
-            m_pPaintDevice->DrawPolyLine( Polygon( aTextPixelBox ), aDottedStyle );
+            m_pPaintDevice->DrawPolyLine( tools::Polygon( aTextPixelBox ), aDottedStyle );
             m_pPaintDevice->EnableMapMode( false );
         }
         else
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index f74ee95c20ee..a0e9f2c12099 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -226,7 +226,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
     case IMAP_OBJ_POLYGON:
     default:
         {
-            const Polygon aPoly( static_cast<const IMapPolygonObject*>(&rMapObject)->GetPolygon(false) );
+            const tools::Polygon aPoly( static_cast<const IMapPolygonObject*>(&rMapObject)->GetPolygon(false) );
 
             const sal_uInt16 nCount = aPoly.GetSize();
             maPolygon.realloc( nCount );
@@ -283,7 +283,7 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const
         {
             const sal_uInt16 nCount = (sal_uInt16)maPolygon.getLength();
 
-            Polygon aPoly( nCount );
+            tools::Polygon aPoly( nCount );
             for( sal_uInt16 nPoint = 0; nPoint < nCount; nPoint++ )
             {
                 Point aPoint( maPolygon[nPoint].X, maPolygon[nPoint].Y );