diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-11-02 11:49:52 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-06 14:23:21 +0100 |
commit | 969b55d8da528ea6295e5e9c56fae595bf3bd4ba (patch) | |
tree | 2e6276d6c6c442d3b9b14e795cf73827e322c4cb | |
parent | 2b77d9dba51e1c3841428f3343e9186ca9c446ae (diff) |
tdf#42949 Fix IWYU warnings in canvas/*/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ie1f6fe98f4e8bc792f5eae1ccdd697c997707004
Reviewed-on: https://gerrit.libreoffice.org/81930
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
49 files changed, 46 insertions, 234 deletions
diff --git a/canvas/IwyuFilter_canvas.yaml b/canvas/IwyuFilter_canvas.yaml index d00a67dbd3a8..25b2157683a7 100644 --- a/canvas/IwyuFilter_canvas.yaml +++ b/canvas/IwyuFilter_canvas.yaml @@ -1,2 +1,35 @@ --- assumeFilename: canvas/source/cairo/cairo_canvas.cxx +blacklist: + canvas/source/cairo/cairo_cachedbitmap.cxx: + # Actually in use + - com/sun/star/rendering/XCanvas.hpp + canvas/source/cairo/cairo_spritecanvas.cxx: + # Needed for nested name specifier + - com/sun/star/awt/XTopWindow.hpp + # Complete type needed for return type + - basegfx/range/b2irange.hxx + canvas/source/cairo/cairo_spritecanvashelper.cxx: + # Needed for boost/polymorphic_cast.hpp + - boost/cast.hpp + canvas/source/opengl/ogl_canvastools.cxx: + # Actually in use + - com/sun/star/rendering/ARGBColor.hpp + canvas/source/opengl/ogl_spritedevicehelper.cxx: + # Needed for nested name specifier + - com/sun/star/awt/XTopWindow.hpp + canvas/source/opengl/ogl_texturecache.cxx: + # Actually in use + - com/sun/star/geometry/IntegerSize2D.hpp + canvas/source/tools/surface.cxx: + # Actually in use + - comphelper/scopeguard.hxx + canvas/source/vcl/cachedbitmap.cxx: + # Actually in use + - com/sun/star/rendering/XCanvas.hpp + canvas/source/vcl/spritecanvas.cxx: + # Actually in use + - com/sun/star/awt/XTopWindow.hpp + canvas/source/vcl/spritecanvashelper.cxx: + # Needed for boost/polymorphic_cast.hpp + - boost/cast.hpp diff --git a/canvas/source/cairo/cairo_cachedbitmap.cxx b/canvas/source/cairo/cairo_cachedbitmap.cxx index 4e47ddd6885f..c907367a49af 100644 --- a/canvas/source/cairo/cairo_cachedbitmap.cxx +++ b/canvas/source/cairo/cairo_cachedbitmap.cxx @@ -19,11 +19,8 @@ #include <sal/config.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/utils/canvastools.hxx> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/RepaintResult.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <tools/diagnose_ex.h> #include "cairo_cachedbitmap.hxx" diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 21033fb8889d..b53f8bcb0bed 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -20,22 +20,13 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#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> -#include <com/sun/star/uno/XComponentContext.hpp> #include <osl/mutex.hxx> #include <tools/diagnose_ex.h> #include <vcl/sysdata.hxx> #include <vcl/opengl/OpenGLWrapper.hxx> -#include <canvas/canvastools.hxx> - #include "cairo_canvas.hxx" using namespace ::cairo; diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 9be8470f66c8..55f1603237b2 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -25,7 +25,6 @@ #include <vcl/bitmapex.hxx> #include <vcl/BitmapTools.hxx> -#include <canvas/canvastools.hxx> #include <cairo.h> #include "cairo_canvasbitmap.hxx" diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index ec63efa6aaa1..0464a06d2b89 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -20,10 +20,8 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <cppuhelper/supportsservice.hxx> -#include <rtl/math.hxx> #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index a9ad255166bd..d3c36b47649e 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -23,10 +23,8 @@ #include <algorithm> #include <tuple> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/utils/canvastools.hxx> #include <basegfx/utils/keystoplerp.hxx> @@ -38,7 +36,6 @@ #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/RenderingIntent.hpp> -#include <com/sun/star/rendering/RepaintResult.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> #include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> #include <com/sun/star/util/Endianness.hpp> @@ -48,7 +45,6 @@ #include <rtl/math.hxx> #include <tools/diagnose_ex.h> #include <vcl/bitmapex.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/BitmapTools.hxx> #include <vcl/canvastools.hxx> #include <vcl/virdev.hxx> @@ -60,7 +56,6 @@ #include "cairo_cachedbitmap.hxx" #include "cairo_canvasbitmap.hxx" #include "cairo_canvashelper.hxx" -#include "cairo_spritecanvas.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 498e02c4ff04..bed807ed4f1c 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -22,8 +22,6 @@ #include <com/sun/star/rendering/TextDirection.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/utils/canvastools.hxx> #include <tools/diagnose_ex.h> #include <vcl/canvastools.hxx> #include <vcl/metric.hxx> diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 703595b360ec..a3dc51ce6ff7 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -22,7 +22,6 @@ #include <basegfx/utils/canvastools.hxx> #include <basegfx/utils/unopolypolygon.hxx> -#include <com/sun/star/lang/NoSupportException.hpp> #include <tools/stream.hxx> #include <vcl/bitmapex.hxx> #include <vcl/canvastools.hxx> @@ -32,7 +31,6 @@ #include "cairo_canvasbitmap.hxx" #include "cairo_devicehelper.hxx" -#include "cairo_spritecanvas.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx index 5117764668c3..d9e2a4318816 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.cxx @@ -19,16 +19,7 @@ #include <sal/config.h> -#include <algorithm> - -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/servicedecl.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> - -#include <canvas/canvastools.hxx> #include "cairo_canvas.hxx" #include "cairo_spritecanvas.hxx" diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 23b0bf04eb52..d2e983ca2ade 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -20,22 +20,15 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/point/b2dpoint.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/utils/canvastools.hxx> #include <com/sun/star/awt/XTopWindow.hpp> +#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> -#include <com/sun/star/uno/XComponentContext.hpp> #include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> -#include <canvas/canvastools.hxx> - #include "cairo_spritecanvas.hxx" using namespace ::cairo; diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index 0a03088cceb3..47bde21e6f25 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -22,11 +22,8 @@ #include <boost/cast.hpp> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/utils/canvastools.hxx> -#include <comphelper/scopeguard.hxx> +#include <basegfx/range/b2irange.hxx> #include <tools/diagnose_ex.h> -#include <vcl/canvastools.hxx> #include <canvas/canvastools.hxx> diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index 39efd2302159..825d6f343b43 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -20,18 +20,10 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <basegfx/utils/canvastools.hxx> -#include <basegfx/utils/unopolypolygon.hxx> -#include <com/sun/star/lang/NoSupportException.hpp> #include <vcl/cairo.hxx> -#include <vcl/canvastools.hxx> -#include <vcl/syschild.hxx> - -#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_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index 6bff2f60259f..8faf7be3a974 100644 --- a/canvas/source/cairo/cairo_spritehelper.cxx +++ b/canvas/source/cairo/cairo_spritehelper.cxx @@ -23,18 +23,12 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/polygon/b2dpolygoncutandtouch.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/utils/canvastools.hxx> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> -#include <canvas/canvastools.hxx> #include <cairo.h> -#include "cairo_canvascustomsprite.hxx" #include "cairo_spritehelper.hxx" using namespace ::cairo; diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 89339783273f..32a62c5ea790 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -23,6 +23,8 @@ #include <math.h> #include <memory> +#include <com/sun/star/rendering/TextDirection.hpp> +#include <canvas/canvastools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <cppuhelper/supportsservice.hxx> @@ -32,7 +34,6 @@ #include <vcl/virdev.hxx> -#include "cairo_spritecanvas.hxx" #include "cairo_textlayout.hxx" #include <cairo.h> diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index ce4caad1684b..0bdacec7b4f7 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -24,23 +24,17 @@ #include <utility> #include <vector> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/propertysequence.hxx> -#include <cppuhelper/factory.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> -#include <osl/process.h> #include <o3tl/functional.hxx> #include <config_features.h> #if HAVE_FEATURE_OPENGL diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx index 1ed881fda5ab..0b95dfb2a5eb 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx @@ -9,8 +9,6 @@ #include <sal/config.h> -#include <tools/diagnose_ex.h> - #include <canvas/canvastools.hxx> #include "ogl_bitmapcanvashelper.hxx" diff --git a/canvas/source/opengl/ogl_canvasbitmap.cxx b/canvas/source/opengl/ogl_canvasbitmap.cxx index 63f10d313288..2a476ec91e58 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.cxx +++ b/canvas/source/opengl/ogl_canvasbitmap.cxx @@ -11,8 +11,6 @@ #include <tools/diagnose_ex.h> -#include <canvas/canvastools.hxx> - #include "ogl_canvasbitmap.hxx" diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index 75c1dda8dfa0..bfcc3c95f84f 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -13,9 +13,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/utils/canvastools.hxx> #include <canvas/canvastools.hxx> #include <canvas/verifyinput.hxx> diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx index 18621b544930..764b848cfa83 100644 --- a/canvas/source/opengl/ogl_canvasfont.cxx +++ b/canvas/source/opengl/ogl_canvasfont.cxx @@ -9,8 +9,7 @@ #include <sal/config.h> -#include <com/sun/star/rendering/PanoseWeight.hpp> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> +#include <com/sun/star/rendering/FontMetrics.hpp> #include <canvas/canvastools.hxx> #include "ogl_canvasfont.hxx" diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index e5966e3e9ebe..94a571f7f3e1 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -14,15 +14,10 @@ #include <epoxy/gl.h> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/utils/canvastools.hxx> #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> -#include <com/sun/star/rendering/RepaintResult.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> #include <rtl/crc.h> #include <tools/diagnose_ex.h> #include <vcl/font.hxx> @@ -32,7 +27,6 @@ #include "ogl_canvasbitmap.hxx" #include "ogl_canvasfont.hxx" #include "ogl_canvastools.hxx" -#include "ogl_spritecanvas.hxx" #include "ogl_texturecache.hxx" #include "ogl_tools.hxx" diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx index 56fa47fbf303..c5fbe0255760 100644 --- a/canvas/source/opengl/ogl_canvastools.cxx +++ b/canvas/source/opengl/ogl_canvastools.cxx @@ -14,11 +14,8 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/utils/canvastools.hxx> #include <basegfx/utils/tools.hxx> #include <com/sun/star/rendering/ARGBColor.hpp> -#include <tools/diagnose_ex.h> #include "ogl_canvastools.hxx" diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 13fd6ec49c63..954ecf03bcf6 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -11,12 +11,7 @@ #include <sal/log.hxx> #include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/servicedecl.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> #include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 0041c42c411c..be838393c5fd 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -14,16 +14,12 @@ #include <basegfx/utils/canvastools.hxx> #include <basegfx/utils/unopolypolygon.hxx> #include <com/sun/star/awt/XTopWindow.hpp> -#include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/rendering/XColorSpace.hpp> #include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <rtl/instance.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/canvastools.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/syschild.hxx> -#include <vcl/sysdata.hxx> #include "ogl_spritedevicehelper.hxx" #include "ogl_spritecanvas.hxx" diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index 63d21c6aa1fe..aa5a35296a97 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -10,8 +10,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> #include <tools/diagnose_ex.h> #include "ogl_textlayout.hxx" diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 564e26199284..cf5c426812fa 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -30,8 +30,6 @@ #include <comphelper/servicedecl.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> #include <o3tl/lazy_update.hxx> #include <canvas/canvastools.hxx> diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 8c8889b66274..52134658b41f 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -24,9 +24,7 @@ #include <com/sun/star/rendering/XBitmap.hpp> #include <com/sun/star/geometry/IntegerSize2D.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/utils/canvastools.hxx> diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index 759a39a27b2e..d8507fb1e29a 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -28,7 +28,6 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index b03a85847313..28e1a660f2a1 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -23,9 +23,6 @@ #include <tools/time.hxx> -#include <algorithm> -#include <limits> - namespace canvas { namespace tools { diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index d0e3f48f5b83..1da3960a2f06 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -19,21 +19,13 @@ #include <sal/config.h> -#include <limits> - -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2drectangle.hxx> -#include <basegfx/utils/canvastools.hxx> -#include <basegfx/utils/tools.hxx> #include <cppuhelper/supportsservice.hxx> -#include <rtl/math.hxx> #include <com/sun/star/rendering/XGraphicDevice.hpp> -#include <canvas/canvastools.hxx> #include <canvas/parametricpolypolygon.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx index 452aa96ab1d9..d44f4cea12ad 100644 --- a/canvas/source/tools/propertysethelper.cxx +++ b/canvas/source/tools/propertysethelper.cxx @@ -20,7 +20,8 @@ #include <sal/config.h> #include <canvas/propertysethelper.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/PropertyVetoException.hpp> +#include <com/sun/star/beans/UnknownPropertyException.hpp> using namespace ::com::sun::star; diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index b414b8a7ac01..1307acea0372 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -23,7 +23,6 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/utils/canvastools.hxx> -#include <basegfx/vector/b2dsize.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx index 164fb781b4d9..b5c2b52f95b6 100644 --- a/canvas/source/tools/surfaceproxy.cxx +++ b/canvas/source/tools/surfaceproxy.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <basegfx/polygon/b2dpolygoncutandtouch.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index b5ee48b813a7..7ca81c054330 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -19,14 +19,8 @@ #include <sal/config.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/range/b2drange.hxx> -#include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/utils/canvastools.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/geometry/AffineMatrix2D.hpp> #include <com/sun/star/geometry/IntegerPoint2D.hpp> #include <com/sun/star/geometry/IntegerSize2D.hpp> @@ -36,21 +30,18 @@ #include <com/sun/star/geometry/RealRectangle2D.hpp> #include <com/sun/star/geometry/RealSize2D.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/FloatingPointBitmapFormat.hpp> -#include <com/sun/star/rendering/FloatingPointBitmapLayout.hpp> +#include <com/sun/star/rendering/FontRequest.hpp> #include <com/sun/star/rendering/IntegerBitmapLayout.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/RenderState.hpp> +#include <com/sun/star/rendering/Texture.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> #include <com/sun/star/rendering/ViewState.hpp> -#include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/util/Endianness.hpp> #include <canvas/verifyinput.hxx> -#include <canvas/canvastools.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx index 00a8a8f5c90f..598f1ef04f64 100644 --- a/canvas/source/vcl/bitmapbackbuffer.cxx +++ b/canvas/source/vcl/bitmapbackbuffer.cxx @@ -21,7 +21,6 @@ #include <osl/diagnose.h> #include <vcl/bitmapex.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/svapp.hxx> #include "bitmapbackbuffer.hxx" diff --git a/canvas/source/vcl/cachedbitmap.cxx b/canvas/source/vcl/cachedbitmap.cxx index 2d65a40c5e33..404b8888402c 100644 --- a/canvas/source/vcl/cachedbitmap.cxx +++ b/canvas/source/vcl/cachedbitmap.cxx @@ -19,11 +19,8 @@ #include <sal/config.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/utils/canvastools.hxx> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/RepaintResult.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <tools/diagnose_ex.h> #include "cachedbitmap.hxx" diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index 988fa530007b..9cbb1c0d7467 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -19,24 +19,12 @@ #include <sal/config.h> -#include <algorithm> - -#include <basegfx/utils/canvastools.hxx> #include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <sal/log.hxx> #include <tools/diagnose_ex.h> -#include <vcl/bitmapex.hxx> -#include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> -#include <vcl/window.hxx> - -#include <canvas/canvastools.hxx> #include "canvas.hxx" -#include "windowoutdevholder.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 48bd6c5d963c..1de5800fa653 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -20,8 +20,6 @@ #include <sal/config.h> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> -#include <vcl/bitmapaccess.hxx> #include "canvasbitmap.hxx" diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index 03a0ea5274fc..44c6dcce1230 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -20,20 +20,11 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/utils/canvastools.hxx> #include <canvas/canvastools.hxx> -#include <com/sun/star/util/Endianness.hpp> -#include <rtl/math.hxx> #include <tools/diagnose_ex.h> -#include <tools/poly.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/BitmapTools.hxx> #include <vcl/canvastools.hxx> -#include <vcl/window.hxx> #include "canvasbitmap.hxx" #include "canvasbitmaphelper.hxx" diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index 4e504155e73f..5a92bc64ef10 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -20,24 +20,11 @@ #include <sal/config.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/utils/canvastools.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/types.hxx> -#include <rtl/math.hxx> #include <tools/diagnose_ex.h> -#include <vcl/alpha.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> -#include <canvas/canvastools.hxx> - #include "canvascustomsprite.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index f423ad5b0318..f7da3efbffbc 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <utility> - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> @@ -36,8 +34,6 @@ #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> -#include <com/sun/star/util/Endianness.hpp> #include <comphelper/sequence.hxx> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> @@ -45,7 +41,6 @@ #include <vcl/bitmapex.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/canvastools.hxx> -#include <vcl/window.hxx> #include <vcl/BitmapAlphaClampFilter.hxx> #include <canvas/canvastools.hxx> diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 18d773e0df9e..efd10070c1f9 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -24,35 +24,26 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#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/utils/keystoplerp.hxx> #include <basegfx/utils/lerp.hxx> #include <basegfx/utils/tools.hxx> -#include <basegfx/vector/b2dsize.hxx> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> -#include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> #include <tools/poly.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/canvastools.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.hxx> #include <canvas/canvastools.hxx> #include <canvas/parametricpolypolygon.hxx> #include "canvashelper.hxx" #include "impltools.hxx" -#include "spritecanvas.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index 904b565af80e..3a48c3f1a490 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -23,15 +23,12 @@ #include <basegfx/utils/unopolypolygon.hxx> #include <canvas/canvastools.hxx> #include <rtl/instance.hxx> -#include <tools/diagnose_ex.h> #include <tools/stream.hxx> #include <vcl/canvastools.hxx> #include <vcl/dibtools.hxx> #include "canvasbitmap.hxx" #include "devicehelper.hxx" -#include "spritecanvas.hxx" -#include "spritecanvashelper.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index 7030c166dd1d..8b908c5a63bf 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <numeric> - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> @@ -28,20 +26,10 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/utils/canvastools.hxx> #include <basegfx/tuple/b2dtuple.hxx> -#include <com/sun/star/geometry/RealBezierSegment2D.hpp> -#include <com/sun/star/geometry/RealPoint2D.hpp> -#include <com/sun/star/geometry/RealRectangle2D.hpp> -#include <com/sun/star/geometry/RealSize2D.hpp> -#include <com/sun/star/rendering/RenderState.hpp> -#include <com/sun/star/rendering/XBitmap.hpp> -#include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/rendering/XIntegerBitmap.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/canvastools.hxx> #include <vcl/BitmapTools.hxx> #include <vcl/metric.hxx> diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx index 89e24d2e337c..e5167fbef49d 100644 --- a/canvas/source/vcl/services.cxx +++ b/canvas/source/vcl/services.cxx @@ -19,21 +19,7 @@ #include <sal/config.h> -#include <algorithm> - -#include <basegfx/utils/canvastools.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/servicedecl.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/canvastools.hxx> -#include <vcl/outdev.hxx> -#include <vcl/window.hxx> - -#include <canvas/canvastools.hxx> #include "canvas.hxx" #include "spritecanvas.hxx" diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 469be8eabcda..f40be1a54049 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -20,20 +20,8 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <algorithm> - -#include <basegfx/utils/canvastools.hxx> #include <com/sun/star/awt/XTopWindow.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <tools/diagnose_ex.h> -#include <vcl/bitmapex.hxx> -#include <vcl/canvastools.hxx> -#include <vcl/outdev.hxx> -#include <vcl/window.hxx> - -#include <canvas/canvastools.hxx> #include "spritecanvas.hxx" #include "windowoutdevholder.hxx" diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 33c578c2feca..29c3295e4b59 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -23,9 +23,7 @@ #include <boost/cast.hpp> #include <basegfx/range/b2drectangle.hxx> -#include <basegfx/utils/canvastools.hxx> #include <tools/diagnose_ex.h> -#include <vcl/bitmapex.hxx> #include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index a31f1af7f24c..cc36193f08ec 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -19,15 +19,11 @@ #include <sal/config.h> -#include <basegfx/utils/canvastools.hxx> -#include <canvas/canvastools.hxx> -#include <vcl/canvastools.hxx> +#include <osl/diagnose.h> +#include <vcl/bitmapex.hxx> #include <vcl/dibtools.hxx> #include <tools/stream.hxx> -#include "canvasbitmap.hxx" -#include "spritecanvas.hxx" -#include "spritecanvashelper.hxx" #include "spritedevicehelper.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 5c30571c78a7..0c721b95a484 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -23,12 +23,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygonclipper.hxx> -#include <basegfx/polygon/b2dpolygoncutandtouch.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <basegfx/range/b2drectangle.hxx> #include <basegfx/utils/canvastools.hxx> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 555f9445ba2d..ab4a0084dc89 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -36,7 +36,6 @@ #include <canvas/canvastools.hxx> -#include "impltools.hxx" #include "textlayout.hxx" #include <memory> |