diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-10 14:04:31 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-11 03:57:18 +0000 |
| commit | e5ec6304149cdcad0d6495b5187c245748b408b5 (patch) | |
| tree | 8548fe3438f33c67d4333308dfa9f390fab3b5e9 /canvas/source | |
| parent | 7bdc6be9c23517eec02ce7139edd7003abbee1f8 (diff) | |
stop inclduing canvas/verbosetraces.hxx and canvas/debug.hxx
also clean-up and 'standardize' the include sections of canvas' source code
Change-Id: Ib437a41ea41ae2ea6528f755ae5b2828775aaf73
Reviewed-on: https://gerrit.libreoffice.org/17633
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'canvas/source')
82 files changed, 716 insertions, 743 deletions
diff --git a/canvas/source/cairo/cairo_cachedbitmap.cxx b/canvas/source/cairo/cairo_cachedbitmap.cxx index 0b3e39ca4bb4..2528a68f78c0 100644 --- a/canvas/source/cairo/cairo_cachedbitmap.cxx +++ b/canvas/source/cairo/cairo_cachedbitmap.cxx @@ -17,17 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include "cairo_cachedbitmap.hxx" -#include "cairo_repainttarget.hxx" +#include <sal/config.h> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/tools/canvastools.hxx> #include <com/sun/star/rendering/RepaintResult.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> +#include <tools/diagnose_ex.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/tools/canvastools.hxx> +#include "cairo_cachedbitmap.hxx" +#include "cairo_repainttarget.hxx" using namespace ::cairo; diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index c8bdca809046..6b46438f58a7 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -17,25 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> - -#include <osl/mutex.hxx> - -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/NoSupportException.hpp> - -#include <toolkit/helper/vclunohelper.hxx> +#include <sal/config.h> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.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 <osl/mutex.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <tools/diagnose_ex.h> #include <vcl/sysdata.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 c0ecc5a73e99..9a2cad1e7c70 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -17,15 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> +#include <sal/config.h> + #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> +#include <vcl/bitmapex.hxx> +#include <vcl/bmpacc.hxx> -#include "cairo_canvasbitmap.hxx" +#include <canvas/canvastools.hxx> -#include <vcl/bmpacc.hxx> -#include <vcl/bitmapex.hxx> +#include "cairo_canvasbitmap.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index b3d97165234d..2a2d94cc2336 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -17,16 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> +#include <sal/config.h> +#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> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> - #include "cairo_canvascustomsprite.hxx" #include "cairo_spritecanvas.hxx" diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 56af4e26298e..2a5bdbb2caf7 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -17,16 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> +#include <sal/config.h> +#include <basegfx/numeric/ftools.hxx> #include <com/sun/star/rendering/PanoseProportion.hpp> #include <cppuhelper/supportsservice.hxx> - +#include <i18nlangtag/languagetag.hxx> #include <rtl/math.hxx> -#include <basegfx/numeric/ftools.hxx> - #include <vcl/metric.hxx> -#include <i18nlangtag/languagetag.hxx> #include "cairo_canvasfont.hxx" #include "cairo_textlayout.hxx" diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 9969292ef842..da78f9d2e86c 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -17,51 +17,48 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> +#include <sal/config.h> -#include <rtl/math.hxx> -#include <rtl/instance.hxx> +#include <algorithm> -#include <com/sun/star/util/Endianness.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/RepaintResult.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> -#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> -#include <com/sun/star/rendering/IntegerBitmapLayout.hpp> -#include <com/sun/star/rendering/ColorSpaceType.hpp> -#include <com/sun/star/rendering/ColorComponentTag.hpp> -#include <com/sun/star/rendering/RenderingIntent.hpp> +#include <boost/tuple/tuple.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/keystoplerp.hxx> #include <basegfx/tools/lerp.hxx> - +#include <com/sun/star/rendering/ColorComponentTag.hpp> +#include <com/sun/star/rendering/ColorSpaceType.hpp> +#include <com/sun/star/rendering/CompositeOperation.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/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> #include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> - -#include <canvas/canvastools.hxx> -#include <canvas/parametricpolypolygon.hxx> - -#include <vcl/canvastools.hxx> +#include <rtl/instance.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> +#include <vcl/canvastools.hxx> #include <vcl/virdev.hxx> -#include "cairo_spritecanvas.hxx" +#include <canvas/canvastools.hxx> +#include <canvas/parametricpolypolygon.hxx> + #include "cairo_cachedbitmap.hxx" -#include "cairo_canvashelper.hxx" #include "cairo_canvasbitmap.hxx" - -#include <boost/tuple/tuple.hpp> -#include <algorithm> +#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 92782af3cb49..cec836cc77e6 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -17,20 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> - -#include <vcl/virdev.hxx> -#include <vcl/metric.hxx> -#include <vcl/canvastools.hxx> +#include <sal/config.h> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/tools/canvastools.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/canvastools.hxx> +#include <vcl/metric.hxx> +#include <vcl/virdev.hxx> + +#include <canvas/canvastools.hxx> #include "cairo_canvasfont.hxx" -#include "cairo_textlayout.hxx" #include "cairo_canvashelper.hxx" +#include "cairo_textlayout.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index a0939952d69b..a0ebb42abf98 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -17,23 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/canvastools.hxx> - -#include <osl/mutex.hxx> -#include <com/sun/star/lang/NoSupportException.hpp> +#include <sal/config.h> -#include <toolkit/helper/vclunohelper.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/unopolypolygon.hxx> - +#include <com/sun/star/lang/NoSupportException.hpp> +#include <osl/mutex.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <tools/stream.hxx> #include <vcl/canvastools.hxx> #include <vcl/dibtools.hxx> -#include <tools/stream.hxx> +#include <canvas/canvastools.hxx> -#include "cairo_spritecanvas.hxx" #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 55bc4d5d8028..2503531daf94 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.cxx @@ -17,17 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/canvastools.hxx> +#include <sal/config.h> + +#include <algorithm> -#include <com/sun/star/registry/XRegistryKey.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 <comphelper/servicedecl.hxx> -#include <algorithm> +#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 5f32a27f0dcc..dae8e0a5749d 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -17,22 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> +#include <sal/config.h> -#include <osl/mutex.hxx> - -#include <com/sun/star/registry/XRegistryKey.hpp> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/tools/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 <com/sun/star/lang/NoSupportException.hpp> - +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/diagnose_ex.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> +#include <canvas/canvastools.hxx> #include "cairo_spritecanvas.hxx" diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index 6fd8ef9d899f..a297810b591c 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -17,21 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> - -#include <vcl/canvastools.hxx> +#include <sal/config.h> -#include <comphelper/scopeguard.hxx> +#include <boost/bind.hpp> +#include <boost/cast.hpp> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> +#include <comphelper/scopeguard.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/canvastools.hxx> -#include <boost/bind.hpp> -#include <boost/cast.hpp> +#include <canvas/canvastools.hxx> -#include "cairo_spritecanvashelper.hxx" #include "cairo_canvascustomsprite.hxx" +#include "cairo_spritecanvashelper.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index e9bd2f926e09..467b4a8738ec 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -17,22 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/canvastools.hxx> - -#include <osl/mutex.hxx> -#include <com/sun/star/lang/NoSupportException.hpp> +#include <sal/config.h> -#include <toolkit/helper/vclunohelper.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/unopolypolygon.hxx> - -#include <vcl/syschild.hxx> +#include <com/sun/star/lang/NoSupportException.hpp> +#include <osl/mutex.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <vcl/cairo.hxx> #include <vcl/canvastools.hxx> +#include <vcl/syschild.hxx> + +#include <canvas/canvastools.hxx> -#include "cairo_spritecanvas.hxx" #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_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index ee7605634e60..0a78151299af 100644 --- a/canvas/source/cairo/cairo_spritehelper.cxx +++ b/canvas/source/cairo/cairo_spritehelper.cxx @@ -17,20 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> - -#include <canvas/canvastools.hxx> +#include <sal/config.h> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> #include <basegfx/numeric/ftools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/polygon/b2dpolygoncutandtouch.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <basegfx/polygon/b2dpolygoncutandtouch.hxx> +#include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> + +#include <canvas/canvastools.hxx> #include "cairo_canvascustomsprite.hxx" #include "cairo_spritehelper.hxx" diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 2510729c704b..3bfd1dd29b8d 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -17,22 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <math.h> +#include <memory> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> - #include <vcl/metric.hxx> -#include <vcl/virdev.hxx> #include <vcl/sysdata.hxx> +#include <vcl/virdev.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> - -#include <memory> -#include "cairo_textlayout.hxx" #include "cairo_spritecanvas.hxx" +#include "cairo_textlayout.hxx" #if defined CAIRO_HAS_FT_FONT # include <cairo-ft.h> diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index d18d34ad44c7..197f0a93e740 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -17,47 +17,46 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#define MAX_TEXTURE_SIZE (2048) -#define MIN_TEXTURE_SIZE (32) -//#define FAKE_MAX_NUMBER_TEXTURES (2) -//#define FAKE_MAX_TEXTURE_SIZE (4096) - -#define VERTEX_BUFFER_SIZE (341*3) // 1023, the size of the internal - // vertex buffer (must be divisable - // by 3, as each triangle primitive - // has 3 vertices) #include <string.h> +#include <boost/scoped_ptr.hpp> + +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2ipoint.hxx> +#include <basegfx/range/b2irectangle.hxx> +#include <basegfx/vector/b2dsize.hxx> +#include <basegfx/vector/b2isize.hxx> +#include <com/sun/star/lang/NoSupportException.hpp> #include <osl/thread.h> #include <osl/time.h> - +#include <tools/diagnose_ex.h> #include <vcl/syschild.hxx> +#include <vcl/sysdata.hxx> #include <vcl/window.hxx> -#include <tools/diagnose_ex.h> - #include <canvas/elapsedtime.hxx> #include <canvas/canvastools.hxx> #include <canvas/rendering/icolorbuffer.hxx> -#include <canvas/rendering/isurface.hxx> #include <canvas/rendering/irendermodule.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/vector/b2dsize.hxx> -#include <basegfx/vector/b2isize.hxx> -#include <basegfx/point/b2ipoint.hxx> -#include <basegfx/range/b2irectangle.hxx> -#include <boost/scoped_ptr.hpp> -#include <com/sun/star/lang/NoSupportException.hpp> +#include <canvas/rendering/isurface.hxx> -#include "dx_rendermodule.hxx" #include "dx_config.hxx" +#include "dx_impltools.hxx" +#include "dx_rendermodule.hxx" -#undef WB_LEFT -#undef WB_RIGHT -#include "dx_impltools.hxx" -#include <vcl/sysdata.hxx> +#define MAX_TEXTURE_SIZE (2048) +#define MIN_TEXTURE_SIZE (32) +//#define FAKE_MAX_NUMBER_TEXTURES (2) +//#define FAKE_MAX_TEXTURE_SIZE (4096) + +#define VERTEX_BUFFER_SIZE (341*3) // 1023, the size of the internal + // vertex buffer (must be divisable + // by 3, as each triangle primitive + // has 3 vertices) + #if defined(DX_DEBUG_IMAGES) # if OSL_DEBUG_LEVEL > 0 diff --git a/canvas/source/directx/dx_bitmap.cxx b/canvas/source/directx/dx_bitmap.cxx index 145848eea05a..3f5672101965 100644 --- a/canvas/source/directx/dx_bitmap.cxx +++ b/canvas/source/directx/dx_bitmap.cxx @@ -17,17 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/range/b2irange.hxx> +#include <tools/diagnose_ex.h> #include "dx_bitmap.hxx" #include "dx_graphicsprovider.hxx" #include "dx_impltools.hxx" -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2irange.hxx> - #if defined(DX_DEBUG_IMAGES) # if OSL_DEBUG_LEVEL > 0 # include <imdebug.h> diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx index 0221cecde14d..09f4f5170a64 100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.cxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx @@ -17,32 +17,29 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> - -#include <com/sun/star/rendering/TexturingMode.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/RepaintResult.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> +#include <algorithm> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/tools/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 <comphelper/sequence.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> + #include <canvas/canvastools.hxx> -#include "dx_spritecanvas.hxx" -#include "dx_impltools.hxx" +#include "dx_bitmapcanvashelper.hxx" #include "dx_canvasfont.hxx" +#include "dx_impltools.hxx" +#include "dx_spritecanvas.hxx" #include "dx_textlayout.hxx" -#include "dx_bitmapcanvashelper.hxx" - -#include <algorithm> using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index ebf370e90073..f8578317d762 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -17,35 +17,33 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <ctype.h> -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> - -#include <osl/mutex.hxx> +#include <cctype> -#include <com/sun/star/awt/XWindow.hpp> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/tools/canvastools.hxx> #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/awt/XWindow.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 <com/sun/star/lang/NoSupportException.hpp> - -#include <toolkit/helper/vclunohelper.hxx> +#include <comphelper/servicedecl.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> -#include <comphelper/servicedecl.hxx> +#include <osl/mutex.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/sysdata.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> +#include <canvas/canvastools.hxx> +#include "dx_canvas.hxx" #include "dx_graphicsprovider.hxx" #include "dx_winstuff.hxx" -#include "dx_canvas.hxx" - -#include <vcl/sysdata.hxx> #define CANVAS_TECH "GDI+" #define CANVAS_SERVICE_NAME "com.sun.star.rendering.Canvas." CANVAS_TECH diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index 60968a19d42f..c30c74f94659 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -17,18 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <cctype> +#include <memory> + +#include <boost/preprocessor/repetition.hpp> +#include <boost/preprocessor/iteration/local.hpp> -#include <ctype.h> -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> - #include <vcl/bitmapex.hxx> -#include <boost/preprocessor/repetition.hpp> -#include <boost/preprocessor/iteration/local.hpp> -#include <memory> +#include <canvas/canvastools.hxx> #include "dx_canvasbitmap.hxx" #include "dx_impltools.hxx" diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index 7dbe80a0d99a..b6295424e005 100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx @@ -17,21 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <ctype.h> -#include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> +#include <cctype> +#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> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> - #include "dx_canvascustomsprite.hxx" -#include "dx_spritecanvas.hxx" #include "dx_impltools.hxx" +#include "dx_spritecanvas.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx index 2ad724d966ca..92528376b9d4 100644 --- a/canvas/source/directx/dx_canvasfont.cxx +++ b/canvas/source/directx/dx_canvasfont.cxx @@ -17,18 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <ctype.h> -#include "dx_winstuff.hxx" -#include "dx_spritecanvas.hxx" -#include "dx_canvasfont.hxx" -#include "dx_textlayout.hxx" +#include <cctype> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/PanoseWeight.hpp> - +#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <cppuhelper/supportsservice.hxx> +#include "dx_canvasfont.hxx" +#include "dx_spritecanvas.hxx" +#include "dx_textlayout.hxx" +#include "dx_winstuff.hxx" + using namespace ::com::sun::star; namespace dxcanvas diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx index a02455268467..be53b374f291 100644 --- a/canvas/source/directx/dx_canvashelper.cxx +++ b/canvas/source/directx/dx_canvashelper.cxx @@ -17,35 +17,31 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> - -#include <com/sun/star/rendering/TexturingMode.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/RepaintResult.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> +#include <algorithm> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/tools/canvastools.hxx> -#include <basegfx/matrix/b2dhommatrixtools.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 <comphelper/sequence.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> + #include <canvas/canvastools.hxx> -#include "dx_spritecanvas.hxx" -#include "dx_impltools.hxx" -#include "dx_vcltools.hxx" #include "dx_canvasfont.hxx" -#include "dx_textlayout.hxx" #include "dx_canvashelper.hxx" - -#include <algorithm> - +#include "dx_impltools.hxx" +#include "dx_spritecanvas.hxx" +#include "dx_textlayout.hxx" +#include "dx_vcltools.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx index 5bde878c75d5..f776ec73c9db 100644 --- a/canvas/source/directx/dx_canvashelper_texturefill.cxx +++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx @@ -17,33 +17,31 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <rtl/math.hxx> - -#include <com/sun/star/rendering/TexturingMode.hpp> +#include <boost/bind.hpp> +#include <boost/scoped_ptr.hpp> +#include <boost/tuple/tuple.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/range/b2drectangle.hxx> +#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/tools/tools.hxx> -#include <basegfx/tools/lerp.hxx> -#include <basegfx/tools/keystoplerp.hxx> +#include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <basegfx/tools/keystoplerp.hxx> +#include <basegfx/tools/lerp.hxx> +#include <basegfx/tools/tools.hxx> +#include <com/sun/star/rendering/TexturingMode.hpp> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> #include <canvas/parametricpolypolygon.hxx> -#include "dx_spritecanvas.hxx" #include "dx_canvashelper.hxx" #include "dx_impltools.hxx" - -#include <boost/scoped_ptr.hpp> -#include <boost/bind.hpp> -#include <boost/tuple/tuple.hpp> +#include "dx_spritecanvas.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 76a68176af3e..e4abde4dda51 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -17,16 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include "dx_config.hxx" - +#include <basegfx/vector/b2ivector.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/anytostring.hxx> -#include <basegfx/vector/b2ivector.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> +#include "dx_config.hxx" + using namespace com::sun::star; namespace dxcanvas diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx index 384d635dfb6d..f6a04057e420 100644 --- a/canvas/source/directx/dx_devicehelper.cxx +++ b/canvas/source/directx/dx_devicehelper.cxx @@ -17,26 +17,28 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <ctype.h> -#include <vcl/window.hxx> -#include <vcl/canvastools.hxx> -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> +#include <cctype> -#include <osl/mutex.hxx> +#include <basegfx/tools/canvastools.hxx> #include <com/sun/star/lang/NoSupportException.hpp> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <basegfx/tools/canvastools.hxx> -#include "dx_linepolypolygon.hxx" -#include "dx_spritecanvas.hxx" +#include <tools/diagnose_ex.h> +#include <vcl/canvastools.hxx> +#include <vcl/outdev.hxx> +#include <vcl/sysdata.hxx> +#include <vcl/window.hxx> + +#include <canvas/canvastools.hxx> + #include "dx_canvasbitmap.hxx" #include "dx_devicehelper.hxx" +#include "dx_linepolypolygon.hxx" +#include "dx_spritecanvas.hxx" #include "dx_winstuff.hxx" -#include <vcl/sysdata.hxx> -#include <vcl/outdev.hxx> - using namespace ::com::sun::star; namespace dxcanvas diff --git a/canvas/source/directx/dx_gdiplususer.cxx b/canvas/source/directx/dx_gdiplususer.cxx index 9c6e33f0ccca..b1517e65f52a 100644 --- a/canvas/source/directx/dx_gdiplususer.cxx +++ b/canvas/source/directx/dx_gdiplususer.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <osl/mutex.hxx> -#include "dx_winstuff.hxx" #include "dx_gdiplususer.hxx" +#include "dx_winstuff.hxx" namespace dxcanvas diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx index 98a9e49f01f9..f2d0e7745ba7 100644 --- a/canvas/source/directx/dx_impltools.cxx +++ b/canvas/source/directx/dx_impltools.cxx @@ -17,37 +17,36 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <ctype.h> -#include <basegfx/numeric/ftools.hxx> +#include <algorithm> +#include <cctype> +#include <vector> -#include <tools/diagnose_ex.h> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/geometry/RealPoint2D.hpp> -#include <com/sun/star/geometry/IntegerRectangle2D.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2irectangle.hxx> -#include <basegfx/range/b2drectangle.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/b2drectangle.hxx> +#include <basegfx/range/b2irectangle.hxx> #include <basegfx/tools/canvastools.hxx> +#include <com/sun/star/geometry/IntegerRectangle2D.hpp> +#include <com/sun/star/geometry/RealPoint2D.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> #include <canvas/verifyinput.hxx> -#include "dx_impltools.hxx" -#include "dx_vcltools.hxx" -#include "dx_linepolypolygon.hxx" +#include "dx_canvas.hxx" #include "dx_canvasbitmap.hxx" #include "dx_canvasfont.hxx" -#include "dx_canvas.hxx" +#include "dx_impltools.hxx" +#include "dx_linepolypolygon.hxx" #include "dx_spritecanvas.hxx" - -#include <vector> -#include <algorithm> +#include "dx_vcltools.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_linepolypolygon.cxx b/canvas/source/directx/dx_linepolypolygon.cxx index 112aee25a2ff..801905c6ce7d 100644 --- a/canvas/source/directx/dx_linepolypolygon.cxx +++ b/canvas/source/directx/dx_linepolypolygon.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <basegfx/tools/canvastools.hxx> + #include "dx_linepolypolygon.hxx" diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index d6a0e78d655c..bece2437e03c 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -17,31 +17,29 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <ctype.h> -#include <tools/diagnose_ex.h> - -#include <canvas/canvastools.hxx> -#include <osl/mutex.hxx> - -#include <com/sun/star/registry/XRegistryKey.hpp> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/tools/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 <com/sun/star/lang/NoSupportException.hpp> - -#include <toolkit/helper/vclunohelper.hxx> +#include <comphelper/servicedecl.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> -#include <comphelper/servicedecl.hxx> +#include <osl/mutex.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <tools/diagnose_ex.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> +#include <canvas/canvastools.hxx> -#include "dx_winstuff.hxx" #include "dx_spritecanvas.hxx" +#include "dx_winstuff.hxx" #define CANVAS_TECH "DX9" diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx index e596805b2316..ff485e73c8e7 100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx @@ -17,20 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> - -#include <comphelper/scopeguard.hxx> +#include <boost/bind.hpp> +#include <boost/cast.hpp> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> +#include <comphelper/scopeguard.hxx> +#include <tools/diagnose_ex.h> -#include <boost/bind.hpp> -#include <boost/cast.hpp> +#include <canvas/canvastools.hxx> -#include "dx_spritecanvashelper.hxx" #include "dx_canvascustomsprite.hxx" +#include "dx_spritecanvashelper.hxx" #if defined(DX_DEBUG_IMAGES) # if OSL_DEBUG_LEVEL > 0 diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx index 6664f23c6796..bb1a5470881c 100644 --- a/canvas/source/directx/dx_spritedevicehelper.cxx +++ b/canvas/source/directx/dx_spritedevicehelper.cxx @@ -17,22 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <ctype.h> -#include <vcl/window.hxx> -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> -#include <osl/mutex.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <canvas/canvastools.hxx> #include <com/sun/star/lang/NoSupportException.hpp> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/sysdata.hxx> +#include <vcl/window.hxx> + +#include "dx_canvasbitmap.hxx" #include "dx_linepolypolygon.hxx" #include "dx_spritecanvas.hxx" -#include "dx_canvasbitmap.hxx" #include "dx_spritedevicehelper.hxx" #include "dx_winstuff.hxx" -#include <vcl/sysdata.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx index 67dd44fe0d10..17c0292f6605 100644 --- a/canvas/source/directx/dx_spritehelper.cxx +++ b/canvas/source/directx/dx_spritehelper.cxx @@ -17,25 +17,24 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> - -#include <canvas/canvastools.hxx> +#include <sal/config.h> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> #include <basegfx/numeric/ftools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/polygon/b2dpolygoncutandtouch.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <basegfx/polygon/b2dpolygoncutandtouch.hxx> +#include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> + +#include <canvas/canvastools.hxx> #include "dx_canvascustomsprite.hxx" -#include "dx_spritehelper.hxx" #include "dx_impltools.hxx" +#include "dx_spritehelper.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx index abff2019a3ea..e5d827f439ac 100644 --- a/canvas/source/directx/dx_surfacebitmap.cxx +++ b/canvas/source/directx/dx_surfacebitmap.cxx @@ -17,18 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <string.h> -#include "dx_surfacebitmap.hxx" +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/range/b2irange.hxx> +#include <tools/diagnose_ex.h> + +#include "dx_graphicsprovider.hxx" #include "dx_impltools.hxx" +#include "dx_surfacebitmap.hxx" #include "dx_surfacegraphics.hxx" -#include "dx_graphicsprovider.hxx" - -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2irange.hxx> #if defined(DX_DEBUG_IMAGES) # if OSL_DEBUG_LEVEL > 0 diff --git a/canvas/source/directx/dx_surfacegraphics.cxx b/canvas/source/directx/dx_surfacegraphics.cxx index 06182b5ffe64..c4f03e9db6ec 100644 --- a/canvas/source/directx/dx_surfacegraphics.cxx +++ b/canvas/source/directx/dx_surfacegraphics.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include "dx_surfacegraphics.hxx" #include "dx_impltools.hxx" +#include "dx_surfacegraphics.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index 3ff3e43d6a44..fea9d9600a57 100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -17,15 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <ctype.h> -#include <cppuhelper/supportsservice.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> +#include <cppuhelper/supportsservice.hxx> + #include "dx_bitmap.hxx" -#include "dx_textlayout.hxx" #include "dx_spritecanvas.hxx" +#include "dx_textlayout.hxx" #include "dx_textlayout_drawhelper.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 2838e570bf0d..55c267d3e208 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -17,32 +17,33 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <tools/poly.hxx> - -#include <vcl/metric.hxx> -#include <vcl/virdev.hxx> -#include <vcl/canvastools.hxx> -#include <tools/diagnose_ex.h> +#include <sal/config.h> #include <memory> #include <boost/bind.hpp> + +#include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/tools/canvastools.hxx> #include <com/sun/star/rendering/FontRequest.hpp> #include <com/sun/star/rendering/PanoseProportion.hpp> #include <com/sun/star/rendering/XCanvasFont.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/scopeguard.hxx> +#include <comphelper/sequence.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <canvas/canvastools.hxx> -#include <canvas/debug.hxx> -#include "dx_impltools.hxx" +#include <tools/diagnose_ex.h> +#include <tools/poly.hxx> +#include <vcl/canvastools.hxx> +#include <vcl/metric.hxx> #include <vcl/sysdata.hxx> -#include <i18nlangtag/languagetag.hxx> -#include "dx_textlayout_drawhelper.hxx" +#include <vcl/virdev.hxx> + +#include <canvas/canvastools.hxx> + #include "dx_bitmap.hxx" #include "dx_canvasfont.hxx" +#include "dx_impltools.hxx" +#include "dx_textlayout_drawhelper.hxx" class css::rendering::XCanvasFont; diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index ace75a27948b..336dc0bd205c 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -17,21 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> +#include <basegfx/numeric/ftools.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <tools/diagnose_ex.h> - -#include <vcl/canvastools.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> +#include <vcl/canvastools.hxx> #include "dx_impltools.hxx" - -#include <basegfx/numeric/ftools.hxx> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/rendering/XIntegerBitmap.hpp> - #include "dx_vcltools.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 7cf2ba870d51..67cf1461f215 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -26,8 +26,14 @@ #include <basegfx/numeric/ftools.hxx> -#ifdef _WINDOWS_ -#error someone else included <windows.h> +#if defined _MSC_VER +#pragma warning(push,1) +#endif + +#ifndef _WINDOWS_ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + #endif // Enabling Direct3D Debug Information Further more, with registry key @@ -38,20 +44,12 @@ # define D3D_DEBUG_INFO #endif -#if defined _MSC_VER -#pragma warning(push,1) -#endif - -#define ULONG win32ULONG #define GradientStyle_RECT win32GradientStyle_RECT #define Polygon win32Polygon #undef WB_LEFT #undef WB_RIGHT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #include <d3d9.h> typedef IDirect3DSurface9 surface_type; @@ -59,19 +57,18 @@ typedef IDirect3DSurface9 surface_type; #undef DrawText -#ifdef __MINGW32__ -using ::std::max; -using ::std::min; +#ifndef max +#define max(a,b) (((a) > (b)) ? (a) : (b)) +#endif +#ifndef min +#define min(a,b) (((a) < (b)) ? (a) : (b)) #endif #include <gdiplus.h> -#ifdef min -# undef min -#endif -#ifdef max -# undef max -#endif +#undef max +#undef min + namespace dxcanvas { diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 301001cc25da..677cf4271020 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -17,27 +17,27 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <osl/mutex.hxx> -#include <osl/process.h> -#include <cppuhelper/implementationentry.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/supportsservice.hxx> +#include <algorithm> +#include <utility> +#include <vector> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#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/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> - -#include <vector> -#include <utility> -#include <algorithm> +#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/XSingleComponentFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/implementationentry.hxx> +#include <cppuhelper/supportsservice.hxx> +#include <osl/mutex.hxx> +#include <osl/process.h> using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx index 715cbdca5a35..ddf39a6bfa0f 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx @@ -7,12 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_bitmapcanvashelper.hxx" +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> +#include <canvas/canvastools.hxx> + +#include "ogl_bitmapcanvashelper.hxx" + using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_canvasbitmap.cxx b/canvas/source/opengl/ogl_canvasbitmap.cxx index b7c5d9bd3e01..08e76a5c1c1e 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.cxx +++ b/canvas/source/opengl/ogl_canvasbitmap.cxx @@ -7,12 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_canvasbitmap.hxx" +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> +#include <canvas/canvastools.hxx> + +#include "ogl_canvasbitmap.hxx" + using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index a1c732790743..dfd1ba1ef902 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -7,22 +7,23 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_canvascustomsprite.hxx" -#include "ogl_canvastools.hxx" -#include "ogl_tools.hxx" +#include <sal/config.h> -#include <canvas/verifyinput.hxx> -#include <canvas/canvastools.hxx> +#include <GL/glew.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> - +#include <basegfx/tools/canvastools.hxx> +#include <canvas/canvastools.hxx> +#include <canvas/verifyinput.hxx> #include <tools/diagnose_ex.h> -#include <GL/glew.h> + +#include "ogl_canvascustomsprite.hxx" +#include "ogl_canvastools.hxx" +#include "ogl_tools.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx index ac2705319f59..ae1cbb95e4d1 100644 --- a/canvas/source/opengl/ogl_canvasfont.cxx +++ b/canvas/source/opengl/ogl_canvasfont.cxx @@ -7,11 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <sal/config.h> + +#include <com/sun/star/rendering/PanoseWeight.hpp> +#include <com/sun/star/rendering/XSpriteCanvas.hpp> + #include "ogl_canvasfont.hxx" #include "ogl_textlayout.hxx" -#include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <com/sun/star/rendering/PanoseWeight.hpp> using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 63acd3cc9a7f..4ecf9914174b 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -7,41 +7,38 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_canvashelper.hxx" +#include <sal/config.h> + +#include <memory> +#include <boost/bind.hpp> +#include <GL/glew.h> -#include <rtl/crc.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> - -#include <com/sun/star/rendering/TexturingMode.hpp> +#include <basegfx/tools/canvastools.hxx> #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/RepaintResult.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> - -#include <vcl/virdev.hxx> -#include <vcl/metric.hxx> +#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> +#include <vcl/metric.hxx> +#include <vcl/virdev.hxx> +#include "ogl_canvasbitmap.hxx" #include "ogl_canvasfont.hxx" #include "ogl_canvastools.hxx" -#include "ogl_canvasbitmap.hxx" #include "ogl_spritecanvas.hxx" #include "ogl_texturecache.hxx" #include "ogl_tools.hxx" -#include <GL/glew.h> - -#include <boost/bind.hpp> +#include "ogl_canvashelper.hxx" -#include <memory> #include <functional> - using namespace ::com::sun::star; namespace oglcanvas diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx index 8144e43f5fd2..1a37c69f4032 100644 --- a/canvas/source/opengl/ogl_canvastools.cxx +++ b/canvas/source/opengl/ogl_canvastools.cxx @@ -7,20 +7,20 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_canvastools.hxx" +#include <sal/config.h> + +#include <GL/glew.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <basegfx/tools/canvastools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/tools/tools.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> - +#include <basegfx/tools/canvastools.hxx> +#include <basegfx/tools/tools.hxx> #include <com/sun/star/rendering/ARGBColor.hpp> +#include <tools/diagnose_ex.h> -#include <GL/glew.h> +#include "ogl_canvastools.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 42c09e125a57..0f7c7d020369 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -7,23 +7,21 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_spritecanvas.hxx" - -#include <osl/mutex.hxx> +#include <sal/config.h> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/NoSupportException.hpp> - -#include <toolkit/helper/vclunohelper.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 <comphelper/servicedecl.hxx> - +#include <osl/mutex.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include "ogl_canvascustomsprite.hxx" +#include "ogl_spritecanvas.hxx" #define SPRITECANVAS_SERVICE_NAME "com.sun.star.rendering.SpriteCanvas.OGL" #define SPRITECANVAS_IMPLEMENTATION_NAME "com.sun.star.comp.rendering.SpriteCanvas.OGL" diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 7bab39f95a82..e5da0f23d1a4 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -7,29 +7,28 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_spritedevicehelper.hxx" -#include "ogl_spritecanvas.hxx" -#include "ogl_canvasbitmap.hxx" -#include "ogl_canvastools.hxx" -#include "ogl_canvascustomsprite.hxx" -#include "ogl_texturecache.hxx" +#include <sal/config.h> #include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/unopolypolygon.hxx> - -#include <osl/mutex.hxx> -#include <rtl/instance.hxx> -#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/rendering/XColorSpace.hpp> #include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> - -#include <vcl/sysdata.hxx> -#include <vcl/syschild.hxx> -#include <vcl/canvastools.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <osl/mutex.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" +#include "ogl_canvasbitmap.hxx" +#include "ogl_canvastools.hxx" +#include "ogl_canvascustomsprite.hxx" +#include "ogl_texturecache.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index a6b0b24b215b..4b470f3ab341 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -7,12 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_textlayout.hxx" +#include <sal/config.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <tools/diagnose_ex.h> +#include "ogl_textlayout.hxx" + using namespace ::com::sun::star; namespace oglcanvas diff --git a/canvas/source/opengl/ogl_texturecache.cxx b/canvas/source/opengl/ogl_texturecache.cxx index 5fe3581d4179..6283bd883993 100644 --- a/canvas/source/opengl/ogl_texturecache.cxx +++ b/canvas/source/opengl/ogl_texturecache.cxx @@ -7,11 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ogl_texturecache.hxx" +#include <sal/config.h> + +#include <GL/glew.h> #include <com/sun/star/geometry/IntegerSize2D.hpp> -#include <GL/glew.h> +#include "ogl_texturecache.hxx" + using namespace ::com::sun::star; diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 92332a6c1fb9..acef6484472b 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -17,27 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <com/sun/star/rendering/XSimpleCanvas.hpp> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <boost/bind.hpp> +#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/PanoseLetterForm.hpp> #include <com/sun/star/rendering/PanoseWeight.hpp> -#include <com/sun/star/lang/XServiceName.hpp> - -#include <o3tl/lazy_update.hxx> +#include <com/sun/star/rendering/XSimpleCanvas.hpp> +#include <comphelper/servicedecl.hxx> +#include <cppuhelper/basemutex.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> - -#include <comphelper/servicedecl.hxx> - -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <o3tl/lazy_update.hxx> #include <canvas/canvastools.hxx> -#include <boost/bind.hpp> #include <functional> diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 29f204121ac0..02bf2ea7e9f1 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -17,15 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <canvas/base/cachedprimitivebase.hxx> - +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/tools/canvastools.hxx> #include <com/sun/star/rendering/RepaintResult.hpp> #include <cppuhelper/supportsservice.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <canvas/base/cachedprimitivebase.hxx> + using namespace ::com::sun::star; diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 8198d966ff9e..6a421361319f 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -17,21 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> +#include <sal/config.h> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/numeric/ftools.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> #include <canvas/base/canvascustomspritehelper.hxx> +#include <canvas/canvastools.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index 3f80eabb64ba..286e304d072e 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -17,51 +17,48 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include <com/sun/star/geometry/AffineMatrix2D.hpp> -#include <com/sun/star/geometry/Matrix2D.hpp> -#include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/util/Endianness.hpp> -#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> -#include <com/sun/star/rendering/IntegerBitmapLayout.hpp> -#include <com/sun/star/rendering/ColorSpaceType.hpp> -#include <com/sun/star/rendering/ColorComponentTag.hpp> -#include <com/sun/star/rendering/RenderingIntent.hpp> -#include <com/sun/star/rendering/RenderState.hpp> -#include <com/sun/star/rendering/ViewState.hpp> -#include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/rendering/XColorSpace.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> +#include <limits> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2drange.hxx> -#include <basegfx/range/b2irange.hxx> -#include <basegfx/range/b2drectangle.hxx> +#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> -#include <basegfx/vector/b2ivector.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> #include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> - +#include <basegfx/vector/b2ivector.hxx> +#include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/geometry/AffineMatrix2D.hpp> +#include <com/sun/star/geometry/Matrix2D.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/rendering/ColorComponentTag.hpp> +#include <com/sun/star/rendering/ColorSpaceType.hpp> +#include <com/sun/star/rendering/CompositeOperation.hpp> +#include <com/sun/star/rendering/IntegerBitmapLayout.hpp> +#include <com/sun/star/rendering/RenderState.hpp> +#include <com/sun/star/rendering/RenderingIntent.hpp> +#include <com/sun/star/rendering/ViewState.hpp> +#include <com/sun/star/rendering/XCanvas.hpp> +#include <com/sun/star/rendering/XColorSpace.hpp> +#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> +#include <com/sun/star/util/Endianness.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/instance.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <vcl/window.hxx> +#include <tools/diagnose_ex.h> #include <vcl/canvastools.hxx> +#include <vcl/window.hxx> #include <canvas/canvastools.hxx> -#include <limits> - using namespace ::com::sun::star; diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index 54b9bf6b77a2..4fa647732bdd 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <osl/time.h> #include <osl/diagnose.h> + #include <canvas/elapsedtime.hxx> #if defined(WNT) diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx index 519e5add72a8..d80a67b0b79e 100644 --- a/canvas/source/tools/page.cxx +++ b/canvas/source/tools/page.cxx @@ -17,7 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <boost/mem_fn.hpp> + #include "page.hxx" namespace canvas diff --git a/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx index 7f5d7769cc2c..726f41ec01f1 100644 --- a/canvas/source/tools/pagemanager.cxx +++ b/canvas/source/tools/pagemanager.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <boost/mem_fn.hpp> + #include "pagemanager.hxx" namespace canvas diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 688f90d4b3d4..8b273cd5e9cd 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -17,22 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> +#include <sal/config.h> -#include <rtl/math.hxx> +#include <limits> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> +#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> #include <basegfx/tools/tools.hxx> #include <cppuhelper/supportsservice.hxx> +#include <rtl/math.hxx> -#include <limits> - +#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 33ddcbd1543f..ba8ade3b82db 100644 --- a/canvas/source/tools/propertysethelper.cxx +++ b/canvas/source/tools/propertysethelper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <canvas/propertysethelper.hxx> diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index 0c00f0fc9b9f..e5c6182fc773 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -17,17 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <tools/diagnose_ex.h> -#include <canvas/spriteredrawmanager.hxx> +#include <algorithm> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/vector/b2dsize.hxx> - -#include <algorithm> -#include <o3tl/compat_functional.hxx> #include <boost/bind.hpp> +#include <o3tl/compat_functional.hxx> +#include <tools/diagnose_ex.h> + +#include <canvas/spriteredrawmanager.hxx> namespace canvas diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx index 717f8722dc98..27b615d8d98a 100644 --- a/canvas/source/tools/surface.cxx +++ b/canvas/source/tools/surface.cxx @@ -17,12 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include "surface.hxx" -#include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <comphelper/scopeguard.hxx> +#include <basegfx/polygon/b2dpolygonclipper.hxx> #include <boost/bind.hpp> +#include <comphelper/scopeguard.hxx> + +#include "surface.hxx" namespace canvas { diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx index 76cce3b96d04..1dfdd9c83d6f 100644 --- a/canvas/source/tools/surfaceproxy.cxx +++ b/canvas/source/tools/surfaceproxy.cxx @@ -17,11 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <boost/bind.hpp> #include <basegfx/polygon/b2dpolygoncutandtouch.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <boost/bind.hpp> + #include "surfaceproxy.hxx" namespace canvas diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx index 62bae2b118f8..fd5eb7712532 100644 --- a/canvas/source/tools/surfaceproxymanager.cxx +++ b/canvas/source/tools/surfaceproxymanager.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/rendering/isurfaceproxymanager.hxx> #include <canvas/rendering/isurfaceproxy.hxx> +#include <canvas/rendering/isurfaceproxymanager.hxx> + #include "surfaceproxy.hxx" namespace canvas diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index 31f7a347e004..ad9822b2395d 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -17,36 +17,36 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#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/tools/canvastools.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/geometry/AffineMatrix2D.hpp> -#include <com/sun/star/geometry/Matrix2D.hpp> -#include <com/sun/star/geometry/RealPoint2D.hpp> -#include <com/sun/star/geometry/RealSize2D.hpp> #include <com/sun/star/geometry/IntegerPoint2D.hpp> #include <com/sun/star/geometry/IntegerSize2D.hpp> -#include <com/sun/star/geometry/RealRectangle2D.hpp> +#include <com/sun/star/geometry/Matrix2D.hpp> #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/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/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/TexturingMode.hpp> #include <com/sun/star/rendering/ViewState.hpp> #include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> #include <com/sun/star/util/Endianness.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> -#include <com/sun/star/rendering/IntegerBitmapLayout.hpp> -#include <com/sun/star/rendering/FloatingPointBitmapFormat.hpp> -#include <com/sun/star/rendering/FloatingPointBitmapLayout.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> - -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2drange.hxx> -#include <basegfx/range/b2irange.hxx> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <canvas/verifyinput.hxx> #include <canvas/canvastools.hxx> diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx index 8f3a98054ed7..64ddc4442d3f 100644 --- a/canvas/source/vcl/backbuffer.cxx +++ b/canvas/source/vcl/backbuffer.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include "backbuffer.hxx" diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx index 4fd79bc2df33..81e47d28660f 100644 --- a/canvas/source/vcl/bitmapbackbuffer.cxx +++ b/canvas/source/vcl/bitmapbackbuffer.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include "bitmapbackbuffer.hxx" +#include <sal/config.h> #include <osl/mutex.hxx> - -#include <vcl/svapp.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> +#include <vcl/svapp.hxx> + +#include "bitmapbackbuffer.hxx" namespace vclcanvas diff --git a/canvas/source/vcl/cachedbitmap.cxx b/canvas/source/vcl/cachedbitmap.cxx index bdbbcab79996..1a7b5afab6fb 100644 --- a/canvas/source/vcl/cachedbitmap.cxx +++ b/canvas/source/vcl/cachedbitmap.cxx @@ -17,18 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <com/sun/star/rendering/RepaintResult.hpp> +#include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <tools/diagnose_ex.h> #include "cachedbitmap.hxx" #include "repainttarget.hxx" -#include <com/sun/star/rendering/RepaintResult.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> - -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/tools/canvastools.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index b36129635171..60e951d42a93 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -17,24 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> -#include <tools/diagnose_ex.h> +#include <algorithm> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <basegfx/tools/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 <tools/diagnose_ex.h> +#include <vcl/bitmapex.hxx> #include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> -#include <vcl/bitmapex.hxx> -#include <basegfx/tools/canvastools.hxx> - -#include <algorithm> +#include <canvas/canvastools.hxx> #include "canvas.hxx" #include "windowoutdevholder.hxx" diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index c7468c817fc3..27bb69748fbc 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -17,12 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> +#include <sal/config.h> + #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> +#include <vcl/bmpacc.hxx> + #include "canvasbitmap.hxx" -#include <vcl/bmpacc.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index 2d21cc4718a5..885e5f8befe8 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -17,26 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/tools/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/window.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> #include <vcl/canvastools.hxx> - -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> - -#include <canvas/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 ae360433a855..aec9d8f2635b 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -18,25 +18,23 @@ */ -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <cppuhelper/supportsservice.hxx> - -#include <rtl/math.hxx> - -#include <vcl/outdev.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/alpha.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/canvastools.hxx> +#include <sal/config.h> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/numeric/ftools.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <cppuhelper/supportsservice.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/alpha.hxx> +#include <vcl/bitmap.hxx> +#include <vcl/bitmapex.hxx> +#include <vcl/canvastools.hxx> +#include <vcl/outdev.hxx> #include <canvas/canvastools.hxx> diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 814095d5bf91..d474e80019a4 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -17,16 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> - -#include <rtl/math.hxx> #include <basegfx/numeric/ftools.hxx> -#include <i18nlangtag/languagetag.hxx> -#include <vcl/metric.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 "canvasfont.hxx" #include "textlayout.hxx" diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 4a83220b7f14..73e09487253b 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -17,46 +17,43 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> +#include <sal/config.h> -#include <rtl/math.hxx> +#include <utility> +#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/tools/canvastools.hxx> +#include <basegfx/vector/b2dsize.hxx> +#include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/util/Endianness.hpp> -#include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> -#include <com/sun/star/drawing/LineCap.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> #include <tools/poly.hxx> -#include <vcl/window.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> #include <vcl/canvastools.hxx> +#include <vcl/window.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/vector/b2dsize.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/polygon/b2dlinegeometry.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> - -#include <utility> - -#include <comphelper/sequence.hxx> #include <canvas/canvastools.hxx> -#include "textlayout.hxx" -#include "canvashelper.hxx" #include "canvasbitmap.hxx" -#include "impltools.hxx" #include "canvasfont.hxx" +#include "canvashelper.hxx" +#include "impltools.hxx" +#include "textlayout.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 0e62f6af2804..7e5828314850 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -17,49 +17,44 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> - -#include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> - -#include <tools/poly.hxx> -#include <vcl/window.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/bmpacc.hxx> -#include <vcl/virdev.hxx> -#include <vcl/canvastools.hxx> +#include <boost/bind.hpp> +#include <boost/tuple/tuple.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2drectangle.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/vector/b2dsize.hxx> +#include <basegfx/polygon/b2dlinegeometry.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/polygon/b2dlinegeometry.hxx> -#include <basegfx/tools/tools.hxx> -#include <basegfx/tools/lerp.hxx> -#include <basegfx/tools/keystoplerp.hxx> +#include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> - +#include <basegfx/tools/keystoplerp.hxx> +#include <basegfx/tools/lerp.hxx> +#include <basegfx/tools/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 <comphelper/sequence.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> +#include <tools/poly.hxx> +#include <vcl/bitmapex.hxx> +#include <vcl/bmpacc.hxx> +#include <vcl/canvastools.hxx> +#include <vcl/virdev.hxx> +#include <vcl/window.hxx> #include <canvas/canvastools.hxx> #include <canvas/parametricpolypolygon.hxx> -#include <boost/bind.hpp> -#include <boost/tuple/tuple.hpp> - -#include "spritecanvas.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 a2b6b56cb970..a833cd109576 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -17,20 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> +#include <sal/config.h> + +#include <basegfx/tools/canvastools.hxx> +#include <basegfx/tools/unopolypolygon.hxx> #include <canvas/canvastools.hxx> #include <rtl/instance.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/diagnose_ex.h> #include <vcl/canvastools.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/tools/unopolypolygon.hxx> #include <vcl/dibtools.hxx> +#include "canvasbitmap.hxx" #include "devicehelper.hxx" #include "spritecanvas.hxx" #include "spritecanvashelper.hxx" -#include "canvasbitmap.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index abdd44d5a69c..fe80ea4dbe28 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -17,42 +17,38 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> +#include <numeric> -#include <com/sun/star/geometry/RealSize2D.hpp> +#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/tools/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/XCanvas.hpp> #include <com/sun/star/rendering/XBitmap.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> -#include <com/sun/star/geometry/RealBezierSegment2D.hpp> +#include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> - -#include <vcl/salbtype.hxx> -#include <vcl/bmpacc.hxx> +#include <com/sun/star/rendering/XPolyPolygon2D.hpp> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> #include <vcl/bitmapex.hxx> -#include <vcl/metric.hxx> +#include <vcl/bmpacc.hxx> #include <vcl/canvastools.hxx> - -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tuple/b2dtuple.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> +#include <vcl/metric.hxx> +#include <vcl/salbtype.hxx> #include <canvas/canvastools.hxx> -#include "impltools.hxx" #include "canvasbitmap.hxx" - -#include <numeric> +#include "impltools.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx index 36c1afbddb75..283b1a9b35ad 100644 --- a/canvas/source/vcl/services.cxx +++ b/canvas/source/vcl/services.cxx @@ -17,26 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <canvas/canvastools.hxx> +#include <algorithm> -#include <com/sun/star/registry/XRegistryKey.hpp> +#include <basegfx/tools/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 <comphelper/servicedecl.hxx> - +#include <vcl/bitmapex.hxx> #include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> -#include <vcl/bitmapex.hxx> -#include <basegfx/tools/canvastools.hxx> - -#include <algorithm> +#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 be38a8e4b5cc..f6eb7c6e6ce9 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -17,25 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <canvas/canvastools.hxx> +#include <algorithm> -#include <com/sun/star/registry/XRegistryKey.hpp> +#include <boost/bind.hpp> + +#include <basegfx/tools/canvastools.hxx> #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 <vcl/bitmapex.hxx> - -#include <basegfx/tools/canvastools.hxx> -#include <boost/bind.hpp> - -#include <algorithm> +#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 2a51868b4936..00ba17541b3b 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -17,24 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <canvas/canvastools.hxx> +#include <boost/bind.hpp> +#include <boost/cast.hpp> +#include <basegfx/range/b2drectangle.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/bitmapex.hxx> #include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> -#include <vcl/bitmapex.hxx> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/tools/canvastools.hxx> - -#include <boost/bind.hpp> -#include <boost/cast.hpp> +#include <canvas/canvastools.hxx> -#include "spritecanvashelper.hxx" #include "canvascustomsprite.hxx" +#include "spritecanvashelper.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index 076cca0a9a78..ec0feeeb8273 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -17,17 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> +#include <sal/config.h> + +#include <basegfx/tools/canvastools.hxx> #include <canvas/canvastools.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/canvastools.hxx> -#include <basegfx/tools/canvastools.hxx> #include <vcl/dibtools.hxx> -#include "spritedevicehelper.hxx" +#include "canvasbitmap.hxx" #include "spritecanvas.hxx" #include "spritecanvashelper.hxx" -#include "canvasbitmap.hxx" +#include "spritedevicehelper.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 4ad2ccbfa183..c58507a1b7ad 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -17,28 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> - -#include <rtl/math.hxx> - -#include <vcl/outdev.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/alpha.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/canvastools.hxx> +#include <sal/config.h> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/tools/canvastools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/polygon/b2dpolygoncutandtouch.hxx> +#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <basegfx/polygon/b2dpolygonclipper.hxx> -#include <basegfx/numeric/ftools.hxx> +#include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <basegfx/tools/canvastools.hxx> +#include <rtl/math.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/alpha.hxx> +#include <vcl/bitmap.hxx> +#include <vcl/bitmapex.hxx> +#include <vcl/canvastools.hxx> +#include <vcl/outdev.hxx> #include <canvas/canvastools.hxx> diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index d55054197752..dab9f45ad45c 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -18,20 +18,20 @@ */ -#include <canvas/debug.hxx> +#include <sal/config.h> + #include <tools/diagnose_ex.h> -#include <canvas/canvastools.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/tools/canvastools.hxx> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/TextDirection.hpp> #include <cppuhelper/supportsservice.hxx> - #include <vcl/metric.hxx> #include <vcl/virdev.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <canvas/canvastools.hxx> #include "impltools.hxx" #include "textlayout.hxx" diff --git a/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx index 398ae72e829b..6246dfd45c17 100644 --- a/canvas/source/vcl/windowoutdevholder.cxx +++ b/canvas/source/vcl/windowoutdevholder.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <com/sun/star/lang/NoSupportException.hpp> +#include <toolkit/helper/vclunohelper.hxx> #include "windowoutdevholder.hxx" -#include <toolkit/helper/vclunohelper.hxx> using namespace ::com::sun::star; |