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>
2019-10-28 09:45:07 +01:00
parent 6d830c6e26
commit be27538c6a
56 changed files with 66 additions and 122 deletions
--- a/canvas/IwyuFilter_canvas.yaml
+++ b/canvas/IwyuFilter_canvas.yaml
@@ -0,0 +1,2 @@
+---
+assumeFilename: canvas/source/cairo/cairo_canvas.cxx
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/utils/canvastools.hxx>
+#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -20,33 +20,26 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVAS_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_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/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>

 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>

-#include <canvas/base/spritecanvasbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
-#include <canvas/base/bufferedgraphicdevicebase.hxx>
-
-#include <basegfx/vector/b2isize.hxx>
+#include <canvas/base/bitmapcanvasbase.hxx>
+#include <canvas/base/graphicdevicebase.hxx>
+#include <canvas/base/integerbitmapbase.hxx>

+#include "cairo_canvashelper.hxx"
 #include "cairo_devicehelper.hxx"
 #include "cairo_repainttarget.hxx"
 #include "cairo_surfaceprovider.hxx"
-#include "cairo_spritecanvashelper.hxx"

 #define CANVAS_SERVICE_NAME        "com.sun.star.rendering.Canvas.Cairo"
 #define CANVAS_IMPLEMENTATION_NAME "com.sun.star.comp.rendering.Canvas.Cairo"
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -26,6 +26,7 @@
 #include <vcl/BitmapTools.hxx>

 #include <canvas/canvastools.hxx>
+#include <cairo.h>

 #include "cairo_canvasbitmap.hxx"

--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -28,14 +28,12 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <comphelper/uno3.hxx>

-#include <basegfx/vector/b2isize.hxx>
-
+#include <canvas/base/bitmapcanvasbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/integerbitmapbase.hxx>

 #include "cairo_canvashelper.hxx"
 #include "cairo_repainttarget.hxx"
-#include "cairo_spritecanvas.hxx"


 /* Definition of CanvasBitmap class */
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -27,6 +27,7 @@
 #include <tools/diagnose_ex.h>

 #include <canvas/canvastools.hxx>
+#include <cairo.h>

 #include "cairo_canvascustomsprite.hxx"
 #include "cairo_spritecanvas.hxx"
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -24,14 +24,11 @@
 #include <comphelper/uno3.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 <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>

 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/canvascustomspritebase.hxx>
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -32,8 +32,7 @@

 #include <canvas/vclwrapper.hxx>

-#include "cairo_spritecanvas.hxx"
-
+#include "cairo_surfaceprovider.hxx"


 /* Definition of CanvasFont class */
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -55,6 +55,7 @@

 #include <canvas/canvastools.hxx>
 #include <canvas/parametricpolypolygon.hxx>
+#include <cairo.h>

 #include "cairo_cachedbitmap.hxx"
 #include "cairo_canvasbitmap.hxx"
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_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 <basegfx/vector/b2isize.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>

 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -19,6 +19,8 @@

 #include <sal/config.h>

+#include <com/sun/star/rendering/TextDirection.hpp>
+
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
@@ -28,6 +30,8 @@
 #include <vcl/virdev.hxx>

 #include <canvas/canvastools.hxx>
+#include <canvas/verifyinput.hxx>
+#include <cairo.h>

 #include "cairo_canvasfont.hxx"
 #include "cairo_canvashelper.hxx"
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX

-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>

-#include <vcl/window.hxx>
+#include <vcl/outdev.hxx>

 #include "cairo_surfaceprovider.hxx"

--- a/canvas/source/cairo/cairo_repainttarget.hxx
+++ b/canvas/source/cairo/cairo_repainttarget.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX

-#include <rtl/ref.hxx>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>

 #include <vcl/cairo.hxx>

--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -22,8 +22,6 @@

 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
@@ -40,8 +38,6 @@
 #include <canvas/base/disambiguationhelper.hxx>
 #include <canvas/base/bufferedgraphicdevicebase.hxx>

-#include <basegfx/vector/b2isize.hxx>
-
 #include "cairo_spritedevicehelper.hxx"
 #include "cairo_repainttarget.hxx"
 #include "cairo_surfaceprovider.hxx"
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -30,6 +30,8 @@

 #include <canvas/canvastools.hxx>

+#include <cairo.h>
+
 #include "cairo_canvascustomsprite.hxx"
 #include "cairo_spritecanvashelper.hxx"

--- a/canvas/source/cairo/cairo_spritecanvashelper.hxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_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 <canvas/spriteredrawmanager.hxx>

--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -29,6 +29,8 @@

 #include <canvas/canvastools.hxx>

+#include <cairo.h>
+
 #include "cairo_canvasbitmap.hxx"
 #include "cairo_devicehelper.hxx"
 #include "cairo_spritecanvas.hxx"
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX

 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>

 #include <vcl/window.hxx>
 #include <vcl/cairo.hxx>
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -32,6 +32,7 @@
 #include <tools/diagnose_ex.h>

 #include <canvas/canvastools.hxx>
+#include <cairo.h>

 #include "cairo_canvascustomsprite.hxx"
 #include "cairo_spritehelper.hxx"
--- a/canvas/source/cairo/cairo_spritehelper.hxx
+++ b/canvas/source/cairo/cairo_spritehelper.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX

-#include <com/sun/star/rendering/XCustomSprite.hpp>
-
 #include <canvas/base/canvascustomspritehelper.hxx>

 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>

 #include "cairo_spritecanvas.hxx"

--- a/canvas/source/cairo/cairo_surfaceprovider.hxx
+++ b/canvas/source/cairo/cairo_surfaceprovider.hxx
@@ -23,8 +23,8 @@
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/XInterface.hpp>

+#include <basegfx/vector/b2isize.hxx>
 #include <vcl/cairo.hxx>
-#include <cairo.h>

 class OutputDevice;
 class Bitmap;
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -35,6 +35,8 @@
 #include "cairo_spritecanvas.hxx"
 #include "cairo_textlayout.hxx"

+#include <cairo.h>
+
 #if defined CAIRO_HAS_FT_FONT
 # include <cairo-ft.h>
 #else
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -24,10 +24,10 @@
 #include <cppuhelper/basemutex.hxx>

 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
 #include <com/sun/star/rendering/XTextLayout.hpp>

-#include <basegfx/vector/b2isize.hxx>
-
 #include <vcl/outdev.hxx>

 #include <vcl/cairo.hxx>
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -10,11 +10,10 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX

-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
+#include <com/sun/star/geometry/IntegerPoint2D.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>

-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include "ogl_canvashelper.hxx"

 namespace oglcanvas
--- a/canvas/source/opengl/ogl_canvasbitmap.hxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.hxx
@@ -17,7 +17,7 @@

 #include <canvas/base/integerbitmapbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
-#include <basegfx/vector/b2isize.hxx>
+#include <canvas/base/bitmapcanvasbase.hxx>

 #include "ogl_bitmapcanvashelper.hxx"
 #include "ogl_spritecanvas.hxx"
--- a/canvas/source/opengl/ogl_canvascustomsprite.hxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx
@@ -12,13 +12,10 @@

 #include <cppuhelper/compbase.hxx>

-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>

 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>

 #include <canvas/base/basemutexhelper.hxx>

--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -13,8 +13,8 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>

-#include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XCanvasFont.hpp>
+#include <com/sun/star/geometry/Matrix2D.hpp>

 #include <rtl/ref.hxx>

--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -12,9 +12,6 @@

 #include <com/sun/star/rendering/XCanvas.hpp>

-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-
 #include <o3tl/cow_wrapper.hxx>
 #include <vector>

--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -13,6 +13,8 @@
 #include <sal/config.h>
 #include <vector>

+#include <epoxy/gl.h>
+
 namespace com { namespace sun { namespace star { namespace rendering {
    struct ARGBColor;
 }}}}
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>

-#include <canvas/base/spritecanvasbase.hxx>
+#include <canvas/base/canvasbase.hxx>
 #include <canvas/base/disambiguationhelper.hxx>
 #include <canvas/base/bufferedgraphicdevicebase.hxx>

--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -10,6 +10,7 @@
 #include <sal/config.h>
 #include <sal/log.hxx>

+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/utils/unopolypolygon.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -15,8 +15,6 @@

 #include <com/sun/star/rendering/XTextLayout.hpp>

-#include <basegfx/vector/b2isize.hxx>
-
 #include "ogl_canvasfont.hxx"


--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -22,7 +22,6 @@

 #include <basegfx/vector/b2isize.hxx>
 #include <canvas/rendering/irendermodule.hxx>
-#include <canvas/rendering/isurface.hxx>

 #include "page.hxx"

--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -26,11 +26,8 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <canvas/rendering/irendermodule.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>
-#include <canvas/rendering/isurface.hxx>

-#include "surfacerect.hxx"
 #include "pagemanager.hxx"

 namespace canvas
--- 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"


--- 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>
--- 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>
--- 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 */
--- 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
--- 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"


--- 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"
--- 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 */
--- 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"
--- 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"

--- 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;
--- 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"


--- 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;
--- 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;
--- 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>
--- 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;

--- 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
--- 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"
--- 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;
--- 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
--- 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>
--- 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"