diff options
Diffstat (limited to 'canvas/source/cairo')
22 files changed, 35 insertions, 46 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 1a5e215171ac..21033fb8889d 100644 --- 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> diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 6de087c61894..934b9edccd63 100644 --- 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" diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 938f1b3bdd2e..9be8470f66c8 100644 --- 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" diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index 355a5b9e5de2..2c6f788d078a 100644 --- 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 */ diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index eb166588c7eb..ec63efa6aaa1 100644 --- 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" diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index 95f5bf91ef0c..16ff0c105c7c 100644 --- 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> diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index 20bc51b18df3..f35f6f455d11 100644 --- 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 */ diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 3aa7ad8d0a5d..a9ad255166bd 100644 --- 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" diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index 0e7cef1b75ba..645be63f1a80 100644 --- 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> diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 805a30f7eaa1..498e02c4ff04 100644 --- 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" diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx index 6e59615c32b8..4eeae58eeeae 100644 --- 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" diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx index 56fa7cb3da59..2ec114901f9e 100644 --- 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> diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index cf5a5f4e57ab..1ea4d14f233e 100644 --- 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" diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index b964db61eed9..0a03088cceb3 100644 --- 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" diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx index 1c71b4878a5a..e8ebb515bb4c 100644 --- 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> diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index bbff8d026263..39efd2302159 100644 --- 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" diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx index f7ad11205a67..795a9daa4d07 100644 --- 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> diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index 60e5f07c5e95..6bff2f60259f 100644 --- 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" diff --git a/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx index e66a00d70c8e..ceacd3e3168e 100644 --- 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" diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx index 8b7159f12e7f..0824450726c8 100644 --- 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; diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 8cfa4d40a38e..89339783273f 100644 --- 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 diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index 13d31a7077a1..b5ba2d84bb21 100644 --- 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> |