tdf#42949 Fix IWYU warnings in include/canvas/

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

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

21 files changed, 54 insertions, 61 deletions

diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index 55d156edf474..c15f76413288 100644
--- a/include/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
@@ -21,7 +21,9 @@
 #define INCLUDED_CANVAS_BASE_BITMAPCANVASBASE_HXX
 
 #include <canvas/base/canvasbase.hxx>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
+#include <com/sun/star/geometry/IntegerSize2D.hpp>
+
+namespace com::sun::star::rendering { class XBitmapCanvas; }
 
 namespace canvas
 {
diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index 235091f76798..f3d77d3e9fec 100644
--- a/include/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
@@ -21,12 +21,12 @@
 #define INCLUDED_CANVAS_BASE_BUFFEREDGRAPHICDEVICEBASE_HXX
 
 #include <com/sun/star/awt/XWindow2.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
-#include <com/sun/star/awt/XWindowListener.hpp>
 
 #include <canvas/canvastools.hxx>
 #include <canvas/base/graphicdevicebase.hxx>
 
+namespace com::sun::star::awt { class XTopWindow; }
+
 
 /* Definition of BufferedGraphicDeviceBase class */
 
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 65811c33e0e4..3897aecf6c29 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XCachedPrimitive.hpp>
 #include <com/sun/star/rendering/ViewState.hpp>
 #include <cppuhelper/compbase.hxx>
@@ -30,6 +29,8 @@
 
 #include <canvas/canvastoolsdllapi.h>
 
+namespace com::sun::star::rendering { class XCanvas; }
+
 /* Definition of CachedPrimitiveBase class */
 
 namespace canvas
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index a36af3b71ff3..3166e7fbb086 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -21,11 +21,22 @@
 #define INCLUDED_CANVAS_BASE_CANVASBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/TextDirection.hpp>
+#include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <canvas/verifyinput.hxx>
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::geometry { class XMapping2D; }
+namespace com::sun::star::rendering { class XBitmap; }
+namespace com::sun::star::rendering { class XCachedPrimitive; }
+namespace com::sun::star::rendering { class XCanvasFont; }
+namespace com::sun::star::rendering { class XGraphicDevice; }
+namespace com::sun::star::rendering { class XPolyPolygon2D; }
+namespace com::sun::star::rendering { class XTextLayout; }
+namespace com::sun::star::rendering { struct FontInfo; }
+namespace com::sun::star::rendering { struct StringContext; }
+
 
 namespace canvas
 {
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 9990b37be6e3..14b530b9c5f0 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -20,14 +20,13 @@
 #ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
 #define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/rendering/XCustomSprite.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <canvas/base/integerbitmapbase.hxx>
-#include <canvas/base/sprite.hxx>
+#include <canvas/base/bitmapcanvasbase.hxx>
+
+namespace com::sun::star::rendering { class XPolyPolygon2D; }
 
 namespace canvas
 {
diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index 5e62d4ed88a7..e524a439e454 100644
--- a/include/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
@@ -27,8 +27,15 @@
 #include <basegfx/vector/b2dvector.hxx>
 #include <canvas/base/spritesurface.hxx>
 #include <canvas/canvastoolsdllapi.h>
-#include <com/sun/star/rendering/XCustomSprite.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
+
+namespace com::sun::star::geometry { struct AffineMatrix2D; }
+namespace com::sun::star::geometry { struct RealPoint2D; }
+namespace com::sun::star::geometry { struct RealSize2D; }
+namespace com::sun::star::rendering { class XBitmap; }
+namespace com::sun::star::rendering { class XPolyPolygon2D; }
+namespace com::sun::star::rendering { struct RenderState; }
+namespace com::sun::star::rendering { struct ViewState; }
+
 
 namespace canvas
 {
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index 6e4bdc7f0a6c..b7b3b22a0921 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -21,17 +21,15 @@
 #define INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
 
 #include <rtl/ref.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XColorSpace.hpp>
 
 #include <canvas/parametricpolypolygon.hxx>
 #include <canvas/propertysethelper.hxx>
 #include <canvas/verifyinput.hxx>
 
+namespace com::sun::star::beans { class XPropertySetInfo; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::rendering { class XColorSpace; }
+
 
 /* Definition of GraphicDeviceBase class */
 
diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index ecebd5794a3f..2ea548452ce3 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
 #define INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
 
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <canvas/base/bitmapcanvasbase.hxx>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
+#include <canvas/verifyinput.hxx>
+#include <osl/diagnose.h>
 
 
 namespace canvas
diff --git a/include/canvas/base/sprite.hxx b/include/canvas/base/sprite.hxx
index 349e164f5585..937c0328474b 100644
--- a/include/canvas/base/sprite.hxx
+++ b/include/canvas/base/sprite.hxx
@@ -22,13 +22,10 @@
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 
 namespace basegfx
 {
-    class B2DPoint;
     class B2DVector;
     class B2DRange;
 }
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index 044a279c061e..2809894b7bc0 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -21,11 +21,16 @@
 #define INCLUDED_CANVAS_BASE_SPRITECANVASBASE_HXX
 
 #include <rtl/ref.hxx>
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/InterpolationMode.hpp>
 #include <canvas/base/integerbitmapbase.hxx>
+#include <canvas/base/bitmapcanvasbase.hxx>
 #include <canvas/spriteredrawmanager.hxx>
 
+namespace com::sun::star::rendering { class XAnimation; }
+namespace com::sun::star::rendering { class XAnimatedSprite; }
+namespace com::sun::star::rendering { class XCustomSprite; }
+namespace com::sun::star::rendering { class XSprite; }
+
 
 namespace canvas
 {
diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index 31c8ba3fc345..6e67227fbd0c 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -20,20 +20,17 @@
 #ifndef INCLUDED_CANVAS_CANVASTOOLS_HXX
 #define INCLUDED_CANVAS_CANVASTOOLS_HXX
 
-#include <rtl/math.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
+#include <math.h>
 #include <string.h>
 #include <vector>
 #include <limits>
-#include <algorithm>
 
 #include <canvas/canvastoolsdllapi.h>
 
@@ -62,7 +59,6 @@ namespace com { namespace sun { namespace star { namespace rendering
     class  XCanvas;
     struct Texture;
     class  XIntegerBitmapColorSpace;
-    class  XPolyPolygon2D;
 } } } }
 
 namespace com { namespace sun { namespace star { namespace awt
diff --git a/include/canvas/elapsedtime.hxx b/include/canvas/elapsedtime.hxx
index 7113cff0455e..9fb8bb5dea79 100644
--- a/include/canvas/elapsedtime.hxx
+++ b/include/canvas/elapsedtime.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CANVAS_ELAPSEDTIME_HXX
 #define INCLUDED_CANVAS_ELAPSEDTIME_HXX
 
-#include <sal/types.h>
 #include <canvas/canvastoolsdllapi.h>
 #include <memory>
 
diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx
index 060b2037c532..960f27c084b1 100644
--- a/include/canvas/parametricpolypolygon.hxx
+++ b/include/canvas/parametricpolypolygon.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CANVAS_PARAMETRICPOLYPOLYGON_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XParametricPolyPolygon2D.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
@@ -29,11 +28,7 @@
 
 #include <canvas/canvastoolsdllapi.h>
 
-namespace basegfx
-{
-    class B2DPolygon;
-    class B2DHomMatrix;
-}
+namespace com::sun::star::rendering { class XGraphicDevice; }
 
 
 /* Definition of ParametricPolyPolygon class */
diff --git a/include/canvas/propertysethelper.hxx b/include/canvas/propertysethelper.hxx
index 95126d6de615..509bb45e2b72 100644
--- a/include/canvas/propertysethelper.hxx
+++ b/include/canvas/propertysethelper.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_PROPERTYSETHELPER_HXX
 #define INCLUDED_CANVAS_PROPERTYSETHELPER_HXX
 
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <canvas/canvastools.hxx>
 
 #include <functional>
@@ -30,6 +28,10 @@
 
 #include <canvas/canvastoolsdllapi.h>
 
+namespace com::sun::star::beans { class XPropertyChangeListener; }
+namespace com::sun::star::beans { class XPropertySetInfo; }
+namespace com::sun::star::beans { class XVetoableChangeListener; }
+
 namespace canvas
 {
     /** Really simplistic XPropertySet helper for properties.
diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index 3a877ad49317..7d851131eec8 100644
--- a/include/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
 
 #include <sal/types.h>
-#include <memory>
 
 namespace canvas
 {
diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index 21d03d35d8c7..186dc2b699e7 100644
--- a/include/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
@@ -20,15 +20,11 @@
 #ifndef INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 #define INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 
-#include <sal/types.h>
 #include <memory>
 
 namespace basegfx
 {
-    class B2DRange;
-    class B2IRange;
     class B2IVector;
-    class B2IPoint;
 }
 
 namespace canvas
diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index 68477bc9bee9..67ce0f387dee 100644
--- a/include/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
@@ -20,14 +20,10 @@
 #ifndef INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 #define INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 
-#include <sal/types.h>
-#include <memory>
-
 namespace basegfx
 {
     class B2IRange;
     class B2IPoint;
-    class B2IVector;
 }
 
 namespace canvas
diff --git a/include/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx
index 6baf0af61c09..d4d8e246118e 100644
--- a/include/canvas/rendering/isurfaceproxy.hxx
+++ b/include/canvas/rendering/isurfaceproxy.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 #define INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 
-#include <canvas/rendering/irendermodule.hxx>
-#include <memory>
-
 namespace basegfx
 {
     class B2DRange;
diff --git a/include/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx
index 9cd9bcaf9c1b..155c6f81a199 100644
--- a/include/canvas/rendering/isurfaceproxymanager.hxx
+++ b/include/canvas/rendering/isurfaceproxymanager.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
 #define INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
 
-#include <canvas/rendering/irendermodule.hxx>
-#include <canvas/rendering/icolorbuffer.hxx>
 #include <canvas/canvastoolsdllapi.h>
 #include <memory>
 
 namespace canvas
 {
     struct ISurfaceProxy;
+    struct IColorBuffer;
+    struct IRenderModule;
 
     /** Manager interface, which handles surface proxy objects.
 
diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index 4a3359d6d442..3115fe5d3f84 100644
--- a/include/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
@@ -24,13 +24,11 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/range/b2irange.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <canvas/base/spritesurface.hxx>
 
 #include <vector>
 #include <algorithm>
 
+#include <canvas/base/sprite.hxx>
 #include <canvas/canvastoolsdllapi.h>
 
 /* Definition of SpriteRedrawManager class */
diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx
index ac9d4e840748..edc7dc3c2c55 100644
--- a/include/canvas/verifyinput.hxx
+++ b/include/canvas/verifyinput.hxx
@@ -21,12 +21,7 @@
 #define INCLUDED_CANVAS_VERIFYINPUT_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-
-#include <algorithm>
 
 #include <canvas/canvastoolsdllapi.h>
 
@@ -51,10 +46,9 @@ namespace com { namespace sun { namespace star { namespace rendering
     struct ViewState;
     struct IntegerBitmapLayout;
     struct FontRequest;
-    struct FontInfo;
-    class  XCanvas;
 } } } }
 
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 namespace canvas
 {