tdf#42949 Fix IWYU warnings in include/cppcanvas/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I8174b6e684b5b46a8abd3ca825b7de75f9255df3
Reviewed-on: https://gerrit.libreoffice.org/68703
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

21 files changed, 15 insertions, 44 deletions

diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index fee174300e83..1a61366a8e5d 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -24,6 +24,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <cppcanvas/canvasgraphic.hxx>
+#include <cppcanvas/canvas.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index fee1cf357706..f8b0b666db5a 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
+#include <osl/diagnose.h>
 
 #include "implbitmapcanvas.hxx"
 
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 17ce28b61942..492f6d3de8fc 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.cxx
@@ -19,6 +19,7 @@
 
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <osl/diagnose.h>
 
 #include "implcustomsprite.hxx"
 #include "implcanvas.hxx"
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 65dd9754845e..15452f5dbb41 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -21,6 +21,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <com/sun/star/rendering/InterpolationMode.hpp>
+#include <osl/diagnose.h>
 
 #include "implspritecanvas.hxx"
 #include "implcustomsprite.hxx"
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index c86fba0b1e83..6c92cdbc2c81 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -575,3 +575,6 @@ blacklist:
     include/linguistic/misc.hxx:
     # base class has to be a complete type
     - com/sun/star/frame/XTerminateListener.hpp
+    include/cppcanvas/renderer.hxx:
+    # Used in boost::optional type
+    - basegfx/matrix/b2dhommatrix.hxx
diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx
index 8238b502ffbb..611523066792 100644
--- a/include/cppcanvas/basegfxfactory.hxx
+++ b/include/cppcanvas/basegfxfactory.hxx
@@ -21,12 +21,8 @@
 #define INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX
 
 #include <cppcanvas/canvas.hxx>
-#include <cppcanvas/bitmapcanvas.hxx>
-#include <cppcanvas/spritecanvas.hxx>
 #include <cppcanvas/polypolygon.hxx>
 #include <cppcanvas/bitmap.hxx>
-#include <cppcanvas/renderer.hxx>
-#include <cppcanvas/sprite.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
 #include <cppcanvas/cppcanvasdllapi.h>
@@ -34,7 +30,6 @@
 namespace basegfx
 {
     class B2DPolygon;
-    class B2DPolyPolygon;
 }
 
 
diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx
index 1d4775ccd0aa..9c3e7f843934 100644
--- a/include/cppcanvas/bitmapcanvas.hxx
+++ b/include/cppcanvas/bitmapcanvas.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX
 #define INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX
 
-#include <sal/types.h>
-#include <osl/diagnose.h>
 #include <basegfx/vector/b2isize.hxx>
 #include <cppcanvas/canvas.hxx>
 #include <memory>
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index c8ae6e8ca7e5..441986cd03b6 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_CPPCANVAS_CANVAS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <cppcanvas/font.hxx>
-#include <cppcanvas/color.hxx>
 #include <memory>
 
 namespace basegfx
diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx
index 501df5b51749..ebee831f0a3b 100644
--- a/include/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
 
 #include <sal/types.h>
-#include <cppcanvas/color.hxx>
-#include <cppcanvas/canvas.hxx>
 #include <memory>
 
 namespace basegfx
diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx
index 2f735e52b638..500e5953e7cc 100644
--- a/include/cppcanvas/color.hxx
+++ b/include/cppcanvas/color.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_CPPCANVAS_COLOR_HXX
 #define INCLUDED_CPPCANVAS_COLOR_HXX
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <memory>
+#include <sal/types.h>
 
 /* Definition of Color class */
 
diff --git a/include/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx
index f65943100df5..abbd0c00bb05 100644
--- a/include/cppcanvas/customsprite.hxx
+++ b/include/cppcanvas/customsprite.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
 #define INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
 
-#include <sal/types.h>
 #include <cppcanvas/sprite.hxx>
 #include <cppcanvas/canvas.hxx>
 #include <memory>
diff --git a/include/cppcanvas/font.hxx b/include/cppcanvas/font.hxx
index abcc5b88b686..e52a5778f56f 100644
--- a/include/cppcanvas/font.hxx
+++ b/include/cppcanvas/font.hxx
@@ -22,11 +22,6 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace rendering
-{
-    class  XCanvasFont;
-} } } }
-
 /* Definition of Font class */
 
 namespace cppcanvas
diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx
index 869301652329..058ea25940d4 100644
--- a/include/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
@@ -22,14 +22,9 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppcanvas/canvasgraphic.hxx>
+#include <cppcanvas/color.hxx>
 #include <memory>
 
-namespace basegfx
-{
-    class B2DPolygon;
-    class B2DPolyPolygon;
-}
-
 namespace com { namespace sun { namespace star { namespace rendering
 {
     class  XPolyPolygon2D;
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index b52bffd90e83..6135ebb106b6 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CPPCANVAS_SPRITE_HXX
 #define INCLUDED_CPPCANVAS_SPRITE_HXX
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
 namespace basegfx
@@ -30,11 +29,6 @@ namespace basegfx
     class B2DPoint;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
-{
-    class  XSprite;
-} } } }
-
 
 /* Definition of Sprite class */
 
diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx
index fc449dee5a95..abeef3d2b25f 100644
--- a/include/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_CPPCANVAS_SPRITECANVAS_HXX
 #define INCLUDED_CPPCANVAS_SPRITECANVAS_HXX
 
-#include <sal/types.h>
-#include <osl/diagnose.h>
 #include <basegfx/vector/b2dsize.hxx>
 #include <cppcanvas/canvas.hxx>
-#include <cppcanvas/sprite.hxx>
 #include <cppcanvas/customsprite.hxx>
 #include <memory>
 
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index 96d33fd1cbdc..b36b66a7ad34 100644
--- a/include/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
@@ -23,24 +23,15 @@
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/bitmapcanvas.hxx>
 #include <cppcanvas/spritecanvas.hxx>
-#include <cppcanvas/polypolygon.hxx>
 #include <cppcanvas/bitmap.hxx>
 #include <cppcanvas/renderer.hxx>
-#include <cppcanvas/sprite.hxx>
 
 #include <cppcanvas/cppcanvasdllapi.h>
 
 namespace vcl { class Window; }
-class Bitmap;
 class BitmapEx;
-namespace tools {
-    class Polygon;
-    class PolyPolygon;
-}
-class Size;
-class Graphic;
+
 class GDIMetaFile;
-class Animation;
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 42476891a567..643d7c8eb2d9 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -29,6 +29,7 @@
 #include <cppcanvas/basegfxfactory.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <cppuhelper/exc_hlp.hxx>
 
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index 5e5008f942ec..fce4c234e78a 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -25,6 +25,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <osl/diagnose.h>
 
 #include "layer.hxx"
 
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index fbad7fdd7fc0..e1501a602ab1 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -26,6 +26,7 @@
 #include <sal/log.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
 
 #include <activity.hxx>
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index 1e6e40a6bc6a..a9a9db55a907 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -25,6 +25,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
+#include <cppcanvas/customsprite.hxx>
 
 #include "slidechangebase.hxx"
 #include <tools.hxx>
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 0492ce0761bd..7cc5045bcc59 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -26,6 +26,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 #include <cppcanvas/basegfxfactory.hxx>
+#include <cppcanvas/customsprite.hxx>
 
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/IntegerBitmapLayout.hpp>