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>

3 files changed, 9 insertions, 9 deletions

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() );