From c9d4a2887c13a5df244022276dd79a5bef8af0ea Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Sun, 28 Sep 2014 07:51:19 +0200
Subject: fdo#82577: Handle PolyPolygon

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

Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66
---
 cppcanvas/source/inc/implrenderer.hxx         | 4 ++--
 cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cppcanvas')

diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index fe3d639e732e..88e7e5cc38aa 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -38,7 +38,7 @@ class VirtualDevice;
 class Gradient;
 class Rectangle;
 namespace vcl { class Font; }
-class PolyPolygon;
+namespace tools { class PolyPolygon; }
 class Point;
 class MetaCommentAction;
 
@@ -259,7 +259,7 @@ static float GetSwapFloat( SvStream& rSt )
                                     const char*  pCommentString,
                                     sal_uInt16       nType ) const;
 
-            void createGradientAction( const ::PolyPolygon&           rPoly,
+            void createGradientAction( const ::tools::PolyPolygon&    rPoly,
                                        const ::Gradient&              rGradient,
                                        const ActionFactoryParameters& rParms,
                                        bool                           bIsPolygonRectangle,
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index e5c622367cec..1437f32a0832 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -492,7 +492,7 @@ namespace cppcanvas
             return bRet;
         }
 
-        void ImplRenderer::createGradientAction( const ::PolyPolygon&           rPoly,
+        void ImplRenderer::createGradientAction( const ::tools::PolyPolygon&    rPoly,
                                                  const ::Gradient&              rGradient,
                                                  const ActionFactoryParameters& rParms,
                                                  bool                           bIsPolygonRectangle,
@@ -1743,7 +1743,7 @@ namespace cppcanvas
                                         aTexture.RepeatModeY = rendering::TexturingMode::NONE;
                                     }
 
-                                    ::PolyPolygon aPath;
+                                    ::tools::PolyPolygon aPath;
                                     aFill.getPath( aPath );
 
                                     ::basegfx::B2DPolyPolygon aPoly( aPath.getB2DPolyPolygon() );
-- 
cgit