diff options
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/inc/base/canvasbase.hxx | 1 | ||||
| -rw-r--r-- | canvas/inc/base/integerbitmapbase.hxx | 1 | ||||
| -rw-r--r-- | canvas/inc/vclwrapper.hxx | 1 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 1 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 9 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.hxx | 1 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 1 | ||||
| -rw-r--r-- | canvas/workben/canvasdemo.cxx | 5 |
9 files changed, 2 insertions, 20 deletions
diff --git a/canvas/inc/base/canvasbase.hxx b/canvas/inc/base/canvasbase.hxx index b0f244e5951c..24737f784d59 100644 --- a/canvas/inc/base/canvasbase.hxx +++ b/canvas/inc/base/canvasbase.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/rendering/TextDirection.hpp> -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <verifyinput.hxx> diff --git a/canvas/inc/base/integerbitmapbase.hxx b/canvas/inc/base/integerbitmapbase.hxx index d485233d45c7..43c4401c5ac5 100644 --- a/canvas/inc/base/integerbitmapbase.hxx +++ b/canvas/inc/base/integerbitmapbase.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/rendering/IntegerBitmapLayout.hpp> #include <verifyinput.hxx> -#include <osl/diagnose.h> namespace canvas diff --git a/canvas/inc/vclwrapper.hxx b/canvas/inc/vclwrapper.hxx index a77b2757f8bf..3c1dfbf2d686 100644 --- a/canvas/inc/vclwrapper.hxx +++ b/canvas/inc/vclwrapper.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/svapp.hxx> +#include <memory> namespace canvas { diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 912e3b678ca8..4ee68f94de46 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -30,7 +30,6 @@ #include <canvas/canvastools.hxx> #include <verifyinput.hxx> -#include <cairo.h> #include "cairo_canvasfont.hxx" #include "cairo_canvashelper.hxx" diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index b7235b30d3c1..6f5d114aa99c 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -30,20 +30,11 @@ #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> #include <vcl/metric.hxx> -#include <vcl/sysdata.hxx> #include <vcl/virdev.hxx> #include "cairo_textlayout.hxx" -#include <cairo.h> - -#if defined CAIRO_HAS_FT_FONT -# include <cairo-ft.h> -#else -# error Native API needed. -#endif - using namespace ::cairo; using namespace ::com::sun::star; diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index b2e5c72d0b53..b4159e737e48 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -29,7 +29,6 @@ #include <vcl/outdev.hxx> -#include <vcl/cairo.hxx> #include "cairo_canvasfont.hxx" diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index bc4651f54157..bcca03d0bd45 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -28,8 +28,6 @@ #include "ogl_canvascustomsprite.hxx" #include "ogl_texturecache.hxx" -#include <iterator> - using namespace ::com::sun::star; static void initContext() diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index e56a273a1fe1..8930f8fccb80 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -25,7 +25,6 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/utils/canvastools.hxx> #include <basegfx/vector/b2dsize.hxx> diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 4854a07d1ace..e19e1f45f2af 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -26,7 +26,6 @@ #include <basegfx/utils/canvastools.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/FillRule.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/RenderState.hpp> @@ -35,15 +34,13 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <com/sun/star/ucb/UniversalContentBroker.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <cppuhelper/bootstrap.hxx> #include <vcl/canvastools.hxx> #include <vcl/svapp.hxx> #include <vcl/vclmain.hxx> -#include <vcl/virdev.hxx> -#include <vcl/window.hxx> #include <vcl/wrkwin.hxx> using namespace ::com::sun::star; |