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, 17 insertions, 19 deletions

diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 91dc1165b44b..451c4c550ce8 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -97,16 +97,14 @@ void setupMethodStubs( functor_vector_type& res )
     const Point aPt3(0,0);
     const Point aPt4(450,450);
 
-    const Rectangle   aRect(aPt1,aPt2);
+    const Rectangle aRect(aPt1,aPt2);
     const Rectangle   aRect2(aPt3,aPt4);
-    const Polygon     aPoly(aRect);
-    const Polygon     aPoly2(aRect2);
-    tools::PolyPolygon       aPolyPoly(aPoly);
+    const tools::Polygon aPoly(aRect);
+    const tools::Polygon aPoly2(aRect2);
+    tools::PolyPolygon aPolyPoly(aPoly);
     aPolyPoly.Insert( aPoly2 );
-    Polygon           aPoly3(aPoly2);
-    aPoly3.Rotate( aPoly3.GetBoundRect().Center(),
-                   900 );
-
+    tools::Polygon aPoly3(aPoly2);
+    aPoly3.Rotate( aPoly3.GetBoundRect().Center(), 900 );
     const LineInfo    aLineInfo(LINE_SOLID,5);
 
 #ifdef FIXME_VDEV
@@ -193,7 +191,7 @@ void setupMethodStubs( functor_vector_type& res )
     add(res,
         "DrawPolyLine",
         boost::bind(
-            (void (OutputDevice::*)( const Polygon& ))(
+                (void (OutputDevice::*)( const tools::Polygon& ))(
                 &OutputDevice::DrawPolyLine),
             _1,
             aPoly ));
@@ -204,7 +202,7 @@ void setupMethodStubs( functor_vector_type& res )
     add(res,
         "DrawPolyLine(LineInfo)",
         boost::bind(
-            (void (OutputDevice::*)( const Polygon&, const LineInfo& ))(
+                (void (OutputDevice::*)( const tools::Polygon&, const LineInfo& ))(
                 &OutputDevice::DrawPolyLine),
             _1,
             aPoly, aLineInfo ));
@@ -213,7 +211,7 @@ void setupMethodStubs( functor_vector_type& res )
     add(res,
         "DrawPolygon",
         boost::bind(
-            (void (OutputDevice::*)( const Polygon& ))
+                (void (OutputDevice::*)( const tools::Polygon& ))
                 &OutputDevice::DrawPolygon,
             _1,
             aPoly ));
@@ -830,8 +828,8 @@ void outDevGrind(vcl::RenderContext& rTarget, sal_Int32 nTurns = 100)
     setupMethodStubs( aMethods );
 
     const Rectangle aClipRect(10,10,1000,1000);
-    const Polygon   aPoly1( aClipRect );
-    Polygon         aPoly2( aClipRect );
+    const tools::Polygon aPoly1( aClipRect );
+    tools::Polygon aPoly2( aClipRect );
     aPoly2.Rotate(aClipRect.Center(),450);
     tools::PolyPolygon     aClipPoly(aPoly1);
     aClipPoly.Insert(aPoly2);
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 33cb4f430d8e..c58ae4e9309e 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -492,7 +492,7 @@ public:
                         break;
                     case 2:
                     {
-                        Polygon aPoly(aSub);
+                        tools::Polygon aPoly(aSub);
                         aPoly.Rotate(aSub.Center(), 450);
                         aPoly.Clip(aSmaller);
                         aRegion = vcl::Region(aPoly);
@@ -504,11 +504,11 @@ public:
                         sal_Int32 nTW = aSub.GetWidth()/6;
                         sal_Int32 nTH = aSub.GetHeight()/6;
                         Rectangle aTiny(Point(4, 4), Size(nTW*2, nTH*2));
-                        aPolyPoly.Insert(Polygon(aTiny));
+                        aPolyPoly.Insert( tools::Polygon(aTiny));
                         aTiny.Move(nTW*3, nTH*3);
-                        aPolyPoly.Insert(Polygon(aTiny));
+                        aPolyPoly.Insert( tools::Polygon(aTiny));
                         aTiny.Move(nTW, nTH);
-                        aPolyPoly.Insert(Polygon(aTiny));
+                        aPolyPoly.Insert( tools::Polygon(aTiny));
 
                         aRegion = vcl::Region(aPolyPoly);
                         break;
@@ -541,7 +541,7 @@ public:
             aShrunk.Move(nDx, nDy);
             aShrunk.SetSize(Size(r.GetWidth()-nDx*2,
                                  r.GetHeight()-nDy*2));
-            Polygon aPoly(aShrunk);
+            tools::Polygon aPoly(aShrunk);
             tools::PolyPolygon aPPoly(aPoly);
             rDev.SetLineColor(Color(COL_RED));
             rDev.SetFillColor(Color(COL_RED));
@@ -737,7 +737,7 @@ public:
                     Rectangle aSubRect(r);
                     aSubRect.Move(x * r.GetWidth()/3, y * r.GetHeight()/3);
                     aSubRect.SetSize(Size(r.GetWidth()/2, r.GetHeight()/4));
-                    Polygon aPoly(SAL_N_ELEMENTS(aPoints));
+                    tools::Polygon aPoly(SAL_N_ELEMENTS(aPoints));
                     for (size_t v = 0; v < SAL_N_ELEMENTS(aPoints); v++)
                     {
                         aPoly.SetPoint(Point(aSubRect.Left() +