tdf#42949 Fix IWYU warnings in canvas/source/*/*hxx

Except directx/

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

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

22 files changed, 20 insertions, 57 deletions

diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 739583a14bdc..291842dfda11 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -19,6 +19,8 @@
 
 #include <sal/config.h>
 
+#include <vcl/svapp.hxx>
+
 #include "backbuffer.hxx"
 
 
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 926b25a8fe96..e6df6d857aaf 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/virdev.hxx>
 
-#include <canvas/vclwrapper.hxx>
 #include "outdevprovider.hxx"
 
 #include <memory>
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 1eee73282329..db9e7c4b9f8c 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX
 
-#include <rtl/ref.hxx>
-
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
@@ -29,12 +27,9 @@
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
-#include <cppu/unotype.hxx>
 
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/bitmapcanvasbase.hxx>
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index d632366bed55..934044b59beb 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -27,18 +27,15 @@
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 
-#include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
 
-#include <canvas/vclwrapper.hxx>
-
+#include <canvas/base/bitmapcanvasbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/integerbitmapbase.hxx>
 #include "canvasbitmaphelper.hxx"
 
 #include "impltools.hxx"
 #include "repainttarget.hxx"
-#include "spritecanvas.hxx"
 
 
 /* Definition of CanvasBitmap class */
diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index 31a20d8db795..328f96ca96fa 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.hxx
@@ -21,12 +21,10 @@
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAPHELPER_HXX
 
 #include "canvashelper.hxx"
-#include <canvas/vclwrapper.hxx>
 
 #include <vcl/bitmapex.hxx>
 
 #include "bitmapbackbuffer.hxx"
-#include "spritecanvas.hxx"
 
 
 namespace vclcanvas
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index b3f6d3202b91..91de9c253cd0 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -22,17 +22,12 @@
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
-#include <vcl/virdev.hxx>
-
-#include <canvas/vclwrapper.hxx>
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/spritesurface.hxx>
 #include <canvas/base/canvascustomspritebase.hxx>
@@ -40,9 +35,7 @@
 #include "sprite.hxx"
 #include "canvashelper.hxx"
 #include "spritehelper.hxx"
-#include "backbuffer.hxx"
 #include "impltools.hxx"
-#include "spritecanvas.hxx"
 #include "repainttarget.hxx"
 
 
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 5609cb3334d5..173203a85bdf 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -20,11 +20,13 @@
 #include <sal/config.h>
 
 #include <basegfx/numeric/ftools.hxx>
+#include <canvas/canvastools.hxx>
 #include <com/sun/star/rendering/PanoseProportion.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/math.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/virdev.hxx>
 
 #include "canvasfont.hxx"
 #include "textlayout.hxx"
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index 1a953447aaff..70d546171a41 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -33,8 +33,7 @@
 
 #include <canvas/vclwrapper.hxx>
 
-#include "spritecanvas.hxx"
-#include "impltools.hxx"
+#include "outdevprovider.hxx"
 
 
 /* Definition of CanvasFont class */
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 888b6de3a543..c09d8c81d636 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX
 
+#include <com/sun/star/geometry/IntegerPoint2D.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-
-#include <vcl/outdev.hxx>
-
-#include <canvas/vclwrapper.hxx>
 
 #include "cachedbitmap.hxx"
 #include "outdevprovider.hxx"
diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index 040fda5ebebb..bcb08119752f 100644
--- a/canvas/source/vcl/devicehelper.hxx
+++ b/canvas/source/vcl/devicehelper.hxx
@@ -20,13 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX
 
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
-
-#include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 
 #include "outdevprovider.hxx"
 
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 71501e744040..7030c166dd1d 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -50,6 +50,7 @@
 
 #include "canvasbitmap.hxx"
 #include "impltools.hxx"
+#include "spritecanvas.hxx"
 
 
 using namespace ::com::sun::star;
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index b69067a7cf5c..db74b533a7d6 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -28,9 +28,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 
-#include <canvas/vclwrapper.hxx>
 #include "outdevprovider.hxx"
 
 
diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx
index c09b580cf4f9..10cab044f53e 100644
--- a/canvas/source/vcl/outdevprovider.hxx
+++ b/canvas/source/vcl/outdevprovider.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
 
-#include <sal/types.h>
 #include <memory>
 
 class OutputDevice;
diff --git a/canvas/source/vcl/repainttarget.hxx b/canvas/source/vcl/repainttarget.hxx
index 692310b60012..b5ee27542f8a 100644
--- a/canvas/source/vcl/repainttarget.hxx
+++ b/canvas/source/vcl/repainttarget.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX
 
-#include <rtl/ref.hxx>
-
 #include "cachedbitmap.hxx"
 
 class Point;
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 08c6d9bb2e1d..7681835df2a4 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -34,7 +34,6 @@
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
 #include <canvas/base/spritesurface.hxx>
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 98f40a5087a7..33c578c2feca 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -34,6 +34,7 @@
 
 #include "canvascustomsprite.hxx"
 #include "spritecanvashelper.hxx"
+#include "spritecanvas.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index d2186da26dda..f32c5f955fdf 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -20,17 +20,16 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX
 
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
+#include <com/sun/star/rendering/XAnimatedSprite.hpp>
+#include <com/sun/star/rendering/XAnimation.hpp>
+#include <com/sun/star/rendering/XCustomSprite.hpp>
 
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
 
 #include <canvas/spriteredrawmanager.hxx>
 #include <canvas/elapsedtime.hxx>
-#include <canvas/vclwrapper.hxx>
 #include "canvashelper.hxx"
-#include "impltools.hxx"
 
 
 namespace vclcanvas
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index 8c5d7271c5d6..8db1b115eed3 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -21,12 +21,6 @@
 #define INCLUDED_CANVAS_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/XWindow2.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
-
-#include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 
 #include "backbuffer.hxx"
 #include "devicehelper.hxx"
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 569f3171fef6..5c30571c78a7 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -42,6 +42,7 @@
 #include <canvas/canvastools.hxx>
 #include <config_features.h>
 
+#include "impltools.hxx"
 #include "spritehelper.hxx"
 
 using namespace ::com::sun::star;
diff --git a/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx
index 70770dbec8d9..d25bdc4166f3 100644
--- a/canvas/source/vcl/spritehelper.hxx
+++ b/canvas/source/vcl/spritehelper.hxx
@@ -20,17 +20,13 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX
 
-#include <com/sun/star/rendering/XCustomSprite.hpp>
-
-#include <vcl/virdev.hxx>
+#include <vcl/bitmapex.hxx>
 
 #include <canvas/base/canvascustomspritehelper.hxx>
 #include <canvas/base/spritesurface.hxx>
 #include <canvas/vclwrapper.hxx>
 
 #include "backbuffer.hxx"
-#include "impltools.hxx"
-#include "spritecanvas.hxx"
 
 
 namespace vclcanvas
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 48e6aaac79dc..555f9445ba2d 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -26,7 +26,10 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
 #include <com/sun/star/rendering/TextDirection.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
+#include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/virdev.hxx>
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index 8f5cd1772a4e..f7378f6116cd 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/rendering/StringContext.hpp>
 #include <com/sun/star/rendering/XTextLayout.hpp>
 
-#include <canvas/vclwrapper.hxx>
-
 #include "canvasfont.hxx"
 #include "impltools.hxx"