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>

2 files changed, 8 insertions, 7 deletions

diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index fe581c43c7cf..c6a71ae6edd3 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -479,11 +479,12 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
     return aRetBmp;
 };
 
-Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
-                                 const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
+tools::Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
+                                        const sal_uInt8 cEdgeDetectThreshold,
+                                        const Rectangle* pWorkRectPixel )
 {
     Bitmap      aWorkBmp;
-    Polygon     aRetPoly;
+    tools::Polygon aRetPoly;
     Point       aTmpPoint;
     Rectangle   aWorkRect( aTmpPoint, rBmp.GetSizePixel() );
 
@@ -599,7 +600,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
 
             const sal_uInt16 nNewSize1 = nPolyPos << 1;
 
-            aRetPoly = Polygon( nPolyPos, pPoints1.get() );
+            aRetPoly = tools::Polygon( nPolyPos, pPoints1.get() );
             aRetPoly.SetSize( nNewSize1 + 1 );
             aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
 
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index da4abd4c1b13..cea38481999f 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -198,7 +198,7 @@ XPolygon::XPolygon( const XPolygon& rXPoly )
 }
 
 /// create a XPolygon out of a standard polygon
-XPolygon::XPolygon( const Polygon& rPoly )
+XPolygon::XPolygon( const tools::Polygon& rPoly )
 {
 
     sal_uInt16 nSize = rPoly.GetSize();
@@ -862,7 +862,7 @@ basegfx::B2DPolygon XPolygon::getB2DPolygon() const
     // here. This needs one more conversion but avoids different convertors in
     // the long run
     DBG_ASSERT(pImpXPolygon != 0, "XPolygon::getB2DPolygon(): XPolygon has no implementation incarnated (!)");
-    const Polygon aSource(GetPointCount(), pImpXPolygon->pPointAry, pImpXPolygon->pFlagAry);
+    const tools::Polygon aSource(GetPointCount(), pImpXPolygon->pPointAry, pImpXPolygon->pFlagAry);
 
     return aSource.getB2DPolygon();
 }
@@ -873,7 +873,7 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon)
     // here. This needs one more conversion but avoids different convertors in
     // the long run
 
-    const Polygon aSource(rPolygon);
+    const tools::Polygon aSource(rPolygon);
     sal_uInt16 nSize = aSource.GetSize();
     pImpXPolygon = new ImpXPolygon( nSize );
     pImpXPolygon->nPoints = nSize;