From 48a3359070db7ffbf25b5e4c0cf1840a4673ca3c Mon Sep 17 00:00:00 2001
From: Matteo Casalin <matteo.casalin@yahoo.com>
Date: Thu, 5 Nov 2015 11:41:37 +0100
Subject: [PATCH] Reduce scope of #include <tools/poly.hxx>

Change-Id: I0d64393c029d27c8e6f3b6d360d2509dad16d860
---
 chart2/source/inc/CommonConverters.hxx                | 1 -
 cppcanvas/source/mtfrenderer/textaction.hxx           | 1 -
 drawinglayer/source/primitive2d/textlayoutdevice.cxx  | 1 +
 filter/source/flash/swfwriter.hxx                     | 7 +++++--
 include/drawinglayer/primitive2d/textlayoutdevice.hxx | 2 +-
 include/oox/export/drawingml.hxx                      | 5 ++++-
 vcl/inc/openglgdiimpl.hxx                             | 7 ++++++-
 vcl/inc/regband.hxx                                   | 2 +-
 vcl/source/gdi/impvect.hxx                            | 3 ++-
 vcl/source/gdi/region.cxx                             | 1 +
 10 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index 7c779c94f654..7b42b7fad5a0 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_COMMONCONVERTERS_HXX
 #define INCLUDED_CHART2_SOURCE_INC_COMMONCONVERTERS_HXX
 
-#include <tools/poly.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index 8c1270ed2a51..79260b1a4866 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -25,7 +25,6 @@
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/renderer.hxx>
-#include <tools/poly.hxx>
 
 class VirtualDevice;
 class Point;
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 4ba2fde54735..700d72479f93 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -24,6 +24,7 @@
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/unique_disposing_ptr.hxx>
+#include <tools/gen.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/font.hxx>
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index b6490352d5cd..2ef8ba2f51e4 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -29,7 +29,6 @@
 #include <vcl/vclptr.hxx>
 #include <unotools/tempfile.hxx>
 #include <tools/color.hxx>
-#include <tools/poly.hxx>
 #include <tools/gen.hxx>
 #include <tools/stream.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -41,12 +40,16 @@
 
 class GDIMetaFile;
 class BitmapEx;
-namespace tools { class PolyPolygon; }
 class Gradient;
 class SvtGraphicFill;
 class SvtGraphicStroke;
 class LineInfo;
 namespace basegfx { class B2DPolygon; }
+namespace tools
+{
+    class Polygon;
+    class PolyPolygon;
+}
 
 inline sal_uInt16 _uInt16( sal_Int32 nValue )
 {
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index 720a273236ed..e606f099a607 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -22,7 +22,6 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
-#include <tools/poly.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <vector>
 #include <com/sun/star/lang/Locale.hpp>
@@ -36,6 +35,7 @@ namespace rtl {
 };
 class OutputDevice;
 class GDIMetaFile;
+class Rectangle;
 enum class DrawTextFlags;
 namespace drawinglayer { namespace attribute {
     class FontAttribute;
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index b7eafa33ae44..a58f4f7c46c4 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/uno/XReference.hpp>
-#include <tools/poly.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include "oox/drawingml/drawingmltypes.hxx"
 #include <oox/token/tokens.hxx>
@@ -60,6 +59,10 @@ namespace io {
 
 class OutlinerParaObject;
 
+namespace tools {
+    class PolyPolygon;
+}
+
 namespace oox {
 namespace core {
     class XmlFilterBase;
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 6e82b872abad..917cf01d82ed 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -29,7 +29,6 @@
 #include "opengl/texture.hxx"
 #include "regionband.hxx"
 
-#include <tools/poly.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 
 class SalFrame;
@@ -41,6 +40,12 @@ namespace basegfx
 class B2DTrapezoid;
 };
 
+namespace tools
+{
+    class Polygon;
+    class PolyPolygon;
+}
+
 struct TextureCombo
 {
     std::unique_ptr<OpenGLTexture> mpTexture;
diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx
index 690888291598..205626ab2e70 100644
--- a/vcl/inc/regband.hxx
+++ b/vcl/inc/regband.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_REGBAND_HXX
 #define INCLUDED_VCL_INC_REGBAND_HXX
 
-#include <tools/poly.hxx>
+#include <sal/types.h>
 
 /*
 
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index 235b6f52a5b8..7ad02ea1bffa 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.hxx
@@ -20,9 +20,10 @@
 #ifndef INCLUDED_VCL_SOURCE_GDI_IMPVECT_HXX
 #define INCLUDED_VCL_SOURCE_GDI_IMPVECT_HXX
 
-#include <tools/poly.hxx>
 #include <vcl/gdimtf.hxx>
 
+namespace tools { class PolyPolygon; }
+
 // - Vectorizer -
 namespace ImplVectorizer
 {
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 4dc3c04db943..243c53033c24 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -32,6 +32,7 @@
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/poly.hxx>
 
 namespace
 {