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 | |
| 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>
187 files changed, 768 insertions, 997 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; diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index dbdf3588db97..15bef7d12444 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -20,41 +20,40 @@ // This code strongly inspired by Miguel / Federico's Gnome Canvas demo code. -#include <comphelper/processfactory.hxx> -#include <cppuhelper/servicefactory.hxx> -#include <cppuhelper/bootstrap.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/registry/XSimpleRegistry.hpp> -#include <com/sun/star/ucb/UniversalContentBroker.hpp> +#include <sal/config.h> + +#include <stdio.h> +#include <unistd.h> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/tools/canvastools.hxx> - -#include <vcl/window.hxx> -#include <vcl/virdev.hxx> -#include <vcl/svapp.hxx> -#include <vcl/msgbox.hxx> -#include <vcl/unowrap.hxx> -#include <vcl/canvastools.hxx> - -#include <rtl/bootstrap.hxx> -#include <sal/macros.h> - -#include <com/sun/star/rendering/XCanvas.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/registry/XSimpleRegistry.hpp> +#include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/FillRule.hpp> -#include <com/sun/star/rendering/ViewState.hpp> -#include <com/sun/star/rendering/RenderState.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <com/sun/star/rendering/XGraphicDevice.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> +#include <com/sun/star/rendering/RenderState.hpp> +#include <com/sun/star/rendering/ViewState.hpp> #include <com/sun/star/rendering/XBitmap.hpp> +#include <com/sun/star/rendering/XCanvas.hpp> +#include <com/sun/star/rendering/XGraphicDevice.hpp> +#include <com/sun/star/rendering/XSpriteCanvas.hpp> +#include <com/sun/star/ucb/UniversalContentBroker.hpp> +#include <comphelper/processfactory.hxx> +#include <cppuhelper/bootstrap.hxx> +#include <cppuhelper/servicefactory.hxx> +#include <rtl/bootstrap.hxx> +#include <sal/macros.h> +#include <vcl/canvastools.hxx> +#include <vcl/msgbox.hxx> +#include <vcl/svapp.hxx> +#include <vcl/unowrap.hxx> +#include <vcl/virdev.hxx> +#include <vcl/window.hxx> -#include <stdio.h> -#include <unistd.h> // never import whole leaf namespaces, since this will result in // absolutely weird effects during (Koenig) name lookup diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index 3e1bf4897212..6d1365545a84 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx @@ -38,8 +38,6 @@ #include <memory> #include <boost/noncopyable.hpp> #include <canvas/canvastools.hxx> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/rendering/InterpolationMode.hpp> #include <com/sun/star/rendering/PanoseProportion.hpp> diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 4e0a9d1f8a7e..54358fb23c6b 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequence.hxx> @@ -1297,7 +1295,7 @@ namespace cppcanvas { if( !pClipAction->GetRegion().HasPolyPolygonOrB2DPolyPolygon() ) { - VERBOSE_TRACE( "ImplRenderer::createActions(): non-polygonal clip " + SAL_INFO( "cppcanvas.emf", "ImplRenderer::createActions(): non-polygonal clip " "region encountered, falling back to bounding box!" ); // #121806# explicitly kept integer @@ -1353,7 +1351,7 @@ namespace cppcanvas if( !pClipAction->GetRegion().HasPolyPolygonOrB2DPolyPolygon() ) { - VERBOSE_TRACE( "ImplRenderer::createActions(): non-polygonal clip " + SAL_INFO( "cppcanvas.emf", "ImplRenderer::createActions(): non-polygonal clip " "region encountered, falling back to bounding box!" ); // #121806# explicitly kept integer diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index 52d5d6aa9e6b..43913529778e 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -18,9 +18,7 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/rendering/RenderState.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <basegfx/numeric/ftools.hxx> diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 4c97f766e0ad..d744dd3f368c 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -18,9 +18,7 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index fe5c5a51b478..35fb98b11374 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -23,8 +23,6 @@ #include <tools/gen.hxx> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <com/sun/star/rendering/XBitmap.hpp> diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index e41362e2696d..a5ce13dc86ea 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.hxx @@ -50,9 +50,7 @@ #include <boost/tuple/tuple.hpp> #include <boost/weak_ptr.hpp> #include <canvas/canvastools.hxx> -#include <canvas/debug.hxx> #include <canvas/elapsedtime.hxx> -#include <canvas/verbosetrace.hxx> #include <cmath> #include <com/sun/star/animations/AnimationAdditiveMode.hpp> #include <com/sun/star/animations/AnimationCalcMode.hpp> diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 3a4cf8cf03ca..11b495d279b8 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/animations/AnimationCalcMode.hpp> #include <comphelper/sequence.hxx> diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index a2aa47d67a20..31b6854091f3 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <activitybase.hxx> diff --git a/slideshow/source/engine/activities/continuousactivitybase.cxx b/slideshow/source/engine/activities/continuousactivitybase.cxx index 2d297f627804..16b8aed3f714 100644 --- a/slideshow/source/engine/activities/continuousactivitybase.cxx +++ b/slideshow/source/engine/activities/continuousactivitybase.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include <continuousactivitybase.hxx> diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx index ceb3e30445de..c065b5e11c84 100644 --- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx +++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <continuouskeytimeactivitybase.hxx> diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx index cc5c01c3e86c..e9bacf2a9677 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.cxx +++ b/slideshow/source/engine/activities/discreteactivitybase.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <discreteactivitybase.hxx> diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index f227e89eeb44..d59f94c73ab6 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -19,8 +19,6 @@ // must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <simplecontinuousactivitybase.hxx> diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 57459b4cdced..647bffe41078 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index 6603499bfb36..48edbcad92fa 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <animatedsprite.hxx> diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index f01dc2d1fc32..32f5e3a85cb0 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <animationfactory.hxx> #include <attributemap.hxx> diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index a037b4269f0d..a5f9e4100713 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include "eventqueue.hxx" #include "animationaudionode.hxx" #include "delayevent.hxx" diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index c70ffc3664df..9d28fb39dae5 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> #include <com/sun/star/presentation/ParagraphTarget.hpp> @@ -374,7 +371,7 @@ void AnimationBaseNode::showState() const BaseNode::showState(); SAL_INFO( "slideshow.verbose", "AnimationBaseNode info: independent subset=" << - mbIsIndependentSubset ? "y" : "n" ); + (mbIsIndependentSubset ? "y" : "n") ); } #endif diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx index 6e9ab3c0a9ea..b2fa181c78ac 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.hxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx @@ -44,7 +44,7 @@ public: ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual void showState() const; #endif diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx index c1b47d86ec24..1a61035ebb05 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.cxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/animations/AnimationColorSpace.hpp> #include "coloranimation.hxx" diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx index fcf67b6249d4..fe8cb39cdbbe 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.hxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx @@ -37,7 +37,7 @@ public: : AnimationBaseNode( xNode, pParent, rContext ), mxColorNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationColorNode"; } #endif diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index 17365f331ce1..47e4f961bb20 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/presentation/EffectCommands.hpp> #include <com/sun/star/animations/XAnimate.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index 15f9e079edbf..d20e44c26ce5 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/animations/XAnimate.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> @@ -592,7 +588,7 @@ AnimationNodeSharedPtr AnimationNodeFactory::createAnimationNode( rSlideSize ))); } -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) void AnimationNodeFactory::showTree( AnimationNodeSharedPtr& pRootNode ) { if( pRootNode ) diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx index 8d77a9be9a90..5831fb2ed640 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include "animationpathmotionnode.hxx" #include "animationfactory.hxx" diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx index 44640ec1fd04..e300720c2b16 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx @@ -36,7 +36,7 @@ public: : AnimationBaseNode( xNode, rParent, rContext ), mxPathMotionNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationPathMotionNode"; } #endif diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx index 63c7620603d0..c2f37e3aa5b7 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.cxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx @@ -18,9 +18,6 @@ */ -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include "animationfactory.hxx" #include "setactivity.hxx" #include "animationsetnode.hxx" diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx index f9898bd593af..34c866897c61 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.hxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx @@ -34,7 +34,7 @@ public: NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ) {} -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationSetNode"; } #endif diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 966ce7fbdfaf..b9a99c3ae184 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/animations/AnimationTransformType.hpp> #include "animationtransformnode.hxx" diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx index 330873794c1a..24d0fbe4002f 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx @@ -37,7 +37,7 @@ public: : AnimationBaseNode( xNode, pParent, rContext ), mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationTransformNode"; } #endif diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx index f0e55237e452..6089c8033b9d 100644 --- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include "animationtransitionfilternode.hxx" #include "transitionfactory.hxx" diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 930e4be0a871..909c9f677321 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include "basecontainernode.hxx" #include "eventqueue.hxx" #include "tools.hxx" @@ -176,7 +172,7 @@ bool BaseContainerNode::repeat() return bState; } -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) void BaseContainerNode::showState() const { for( std::size_t i=0; i<maChildren.size(); ++i ) @@ -185,9 +181,9 @@ void BaseContainerNode::showState() const boost::dynamic_pointer_cast<BaseNode>(maChildren[i]); SAL_INFO("slideshow.verbose", "Node connection: n" << - (const void*)this+debugGetCurrentOffset() << + (const char*)this+debugGetCurrentOffset() << " -> n" << - (const void*)pNode.get()+debugGetCurrentOffset() ); + (const char*)pNode.get()+debugGetCurrentOffset() ); pNode->showState(); } diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx index 46b762b45ec6..de351ed83a78 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.hxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx @@ -40,7 +40,7 @@ public: */ void appendChildNode( AnimationNodeSharedPtr const& pNode ); -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual void showState() const; virtual const char* getDescription() const { return "BaseContainerNode"; } #endif diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index f7947b0cb80d..9c857c09c088 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include <com/sun/star/animations/XAnimate.hpp> #include <com/sun/star/presentation/ParagraphTarget.hpp> #include <com/sun/star/animations/AnimationFill.hpp> @@ -680,7 +676,7 @@ void BaseNode::setSelf( const BaseNodeSharedPtr& rSelf ) // Debug -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) void BaseNode::showState() const { const AnimationNode::NodeState eNodeState( getState() ); @@ -728,8 +724,8 @@ void BaseNode::showState() const OUString("Name") ) >>= aName) ) { - SAL_INFO("slideshow.verbose" "Node info: n" << - (const char*)this+debugGetCurrentOffset(), + SAL_INFO("slideshow.verbose", "Node info: n" << + (const char*)this+debugGetCurrentOffset() << ", name \"" << aName << "\""); diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 799feac24d0f..4e9e5c527374 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASENODE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASENODE_HXX -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.hxx> @@ -94,7 +93,7 @@ public: void setSelf( const ::boost::shared_ptr< BaseNode >& rSelf ); -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual void showState() const; virtual const char* getDescription() const; #endif diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx index 65a3421793b7..76a778c4acec 100644 --- a/slideshow/source/engine/animationnodes/generateevent.cxx +++ b/slideshow/source/engine/animationnodes/generateevent.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/animations/XAnimationNode.hpp> diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx index c1dc398fcd2c..1d0b122f6444 100644 --- a/slideshow/source/engine/animationnodes/nodetools.cxx +++ b/slideshow/source/engine/animationnodes/nodetools.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include <com/sun/star/animations/Timing.hpp> #include <tools.hxx> @@ -34,7 +30,7 @@ namespace slideshow { namespace internal { -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) int& debugGetCurrentOffset() { static int lcl_nOffset = 0; // to make each tree output distinct diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx index 1e7a5a04e393..984fe1581053 100644 --- a/slideshow/source/engine/animationnodes/nodetools.hxx +++ b/slideshow/source/engine/animationnodes/nodetools.hxx @@ -30,7 +30,7 @@ #include "attributableshape.hxx" -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) # define DEBUG_NODES_SHOWTREE(a) debugNodesShowTree(a); #else # define DEBUG_NODES_SHOWTREE(a) @@ -44,7 +44,7 @@ namespace slideshow // Tools -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) int& debugGetCurrentOffset(); void debugNodesShowTree( const BaseNode* ); #endif diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx index 1a8e496f62a3..ddc5c18c7925 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx @@ -38,7 +38,7 @@ public: const NodeContext& rContext ) : BaseContainerNode( xNode, rParent, rContext ) {} -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual const char* getDescription() const { return "ParallelTimeContainer"; } #endif diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx index c589d73eb080..68bf6497df9c 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include "propertyanimationnode.hxx" #include "animationfactory.hxx" diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx index 6c9891254920..41a510164751 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx @@ -34,7 +34,7 @@ public: NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ) {} -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual const char* getDescription() const { return "PropertyAnimationNode"; } #endif diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index 7a53e33f1fb7..56dcf0c89814 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -18,9 +18,6 @@ */ -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include "delayevent.hxx" #include "eventqueue.hxx" #include "usereventqueue.hxx" diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx index 490f084ef678..7eb281c4be88 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx @@ -38,7 +38,7 @@ public: NodeContext const& rContext ) : BaseContainerNode( xNode, pParent, rContext ) {} -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) virtual const char* getDescription() const { return "SequentialTimeContainer"; } #endif diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx index 2f94d62b3841..d96a35bcc2ca 100644 --- a/slideshow/source/engine/animationnodes/setactivity.hxx +++ b/slideshow/source/engine/animationnodes/setactivity.hxx @@ -19,10 +19,7 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_SETACTIVITY_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_SETACTIVITY_HXX -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include "animationactivity.hxx" #include "animation.hxx" diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index 1185a89dbeff..b017d97c335f 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <canvas/canvastools.hxx> #include "attributemap.hxx" diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 2be7714360d3..80702bf92ad2 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <rtl/ref.hxx> diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index c7fc66ebec8c..77a23336e238 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx index d4ec3c99285a..bb2432965adc 100644 --- a/slideshow/source/engine/expressionnodefactory.cxx +++ b/slideshow/source/engine/expressionnodefactory.cxx @@ -18,12 +18,8 @@ */ -// must be first -#include <canvas/debug.hxx> #include <expressionnodefactory.hxx> -#include <canvas/verbosetrace.hxx> - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx index 4925bb67033b..92518bdb61ea 100644 --- a/slideshow/source/engine/shapeattributelayer.cxx +++ b/slideshow/source/engine/shapeattributelayer.cxx @@ -19,13 +19,9 @@ // must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <shapeattributelayer.hxx> -#include <canvas/verbosetrace.hxx> - - #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontWeight.hpp> diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index c4aa406ab3e1..e00244131343 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <boost/shared_ptr.hpp> diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 762c05c692b5..d53105e45b74 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> - #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/FontWeight.hpp> diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 5657f2b6c21c..bbc0d53c7814 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/helpers.hxx> #include <canvas/elapsedtime.hxx> diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 4d9f64ca16e5..7d1305a65a8e 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <osl/diagnose.hxx> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index cd273f71fb4c..44539094d93c 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <rtl/math.hxx> diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 00c0766df8a5..263e7b490ab1 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -19,9 +19,7 @@ // must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 03a467a7748b..3422daadfc37 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <gdimtftools.hxx> diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index 564addb76dba..03b899d6040b 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -18,9 +18,7 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include "drawshapesubsetting.hxx" #include "subsettableshapemanager.hxx" diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index b658e5090b3a..df5e918e882f 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <com/sun/star/drawing/XShape.hpp> diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index b0826834ed84..e3c70ff10eb3 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// must be first -#include <canvas/debug.hxx> #include <vcl/cvtgrf.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 00f2456c7c1e..7ab7a0b86ae9 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -18,10 +18,7 @@ */ -// must be first -#include <canvas/verbosetrace.hxx> #include <tools/diagnose_ex.h> -#include <canvas/debug.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index cdef389d59ce..996603297f66 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -19,7 +19,6 @@ // must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include "viewbackgroundshape.hxx" @@ -38,7 +37,6 @@ #include <com/sun/star/rendering/XCanvas.hpp> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <cppcanvas/vclfactory.hxx> #include <cppcanvas/basegfxfactory.hxx> diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 654f91c3f5cd..65d22e8c8e0d 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -19,9 +19,7 @@ #include <config_features.h> -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <math.h> diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 7bf9368e2ac9..9847882f3fe3 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <math.h> @@ -39,7 +37,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <cppcanvas/vclfactory.hxx> #include <cppcanvas/basegfxfactory.hxx> diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 50e1b2522243..04b1fbff227b 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/anytostring.hxx> diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index 1d0568343796..80fbf94c0793 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -18,9 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> - #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b1drange.hxx> #include <basegfx/range/b2dpolyrange.hxx> diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 6a1f924d089e..a0c53b948862 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <basegfx/range/b1drange.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 3ec7a9c15840..796f1ce34124 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/SystemPointer.hpp> diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 853b603ed9c7..9c82dbafd87d 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/anytostring.hxx> diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 3d3c4049693f..3972d5bad809 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -19,7 +19,6 @@ #include <osl/diagnose.hxx> -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> #include <cppcanvas/basegfxfactory.hxx> diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 252f9efd5ba8..33899122264c 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -18,8 +18,6 @@ */ -#include <canvas/debug.hxx> - #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index 998f4d1c764b..bce6e83b331b 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <slidebitmap.hxx> diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index bfb8879eaa04..d1c417ded112 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <cppuhelper/basemutex.hxx> @@ -2113,7 +2112,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) mbSlideShowIdle = false; } -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) // when slideshow is idle, issue an XUpdatable::update() call // exactly once after a previous animation sequence finished - // this might trigger screen dumps on some canvas diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index f699ce1e711d..c73ff64d3598 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> @@ -188,7 +187,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas, pPolyPoly->draw(); } -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) ::cppcanvas::CanvasSharedPtr pCliplessCanvas( pCanvas->clone() ); pCliplessCanvas->setClip(); @@ -605,7 +604,7 @@ private: mpSprite->setPriority( maSpriteContainer.getLayerPriority().getMinimum() ); -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) mpSprite->movePixel( basegfx::B2DPoint(maLayerBoundsPixel.getMinimum()) + basegfx::B2DPoint(10,10) ); diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 64021265589f..7ded14fe2777 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <rtl/math.hxx> @@ -28,7 +26,6 @@ #include <expressionnodefactory.hxx> #include <rtl/ustring.hxx> -#include <canvas/verbosetrace.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> @@ -44,9 +41,7 @@ #endif #include <boost/spirit/include/classic_core.hpp> -#if OSL_DEBUG_LEVEL > 0 #include <iostream> -#endif #include <functional> #include <algorithm> #include <stack> diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 89024107cf14..560693d925f3 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -18,9 +18,7 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/sp_debug.cxx b/slideshow/source/engine/sp_debug.cxx index 2efb80e57532..d7420bb8127f 100644 --- a/slideshow/source/engine/sp_debug.cxx +++ b/slideshow/source/engine/sp_debug.cxx @@ -35,7 +35,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/detail/lightweight_mutex.hpp> -#include <canvas/debug.hxx> #include <cstdlib> #include <map> #include <deque> diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 843a8d273c27..04edb7197121 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> diff --git a/slideshow/source/engine/transitions/barndoorwipe.cxx b/slideshow/source/engine/transitions/barndoorwipe.cxx index 4fbeee2c43be..a2896b3b59a5 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.cxx +++ b/slideshow/source/engine/transitions/barndoorwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.cxx b/slideshow/source/engine/transitions/barwipepolypolygon.cxx index 8b46cb378b2f..5a7a381bfc37 100644 --- a/slideshow/source/engine/transitions/barwipepolypolygon.cxx +++ b/slideshow/source/engine/transitions/barwipepolypolygon.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include "barwipepolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/boxwipe.cxx b/slideshow/source/engine/transitions/boxwipe.cxx index 68342fae4468..dabcc47e5ac3 100644 --- a/slideshow/source/engine/transitions/boxwipe.cxx +++ b/slideshow/source/engine/transitions/boxwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include "boxwipe.hxx" diff --git a/slideshow/source/engine/transitions/checkerboardwipe.cxx b/slideshow/source/engine/transitions/checkerboardwipe.cxx index d3ed071f372a..2f09145af17a 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.cxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include "checkerboardwipe.hxx" diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx index c062586329a1..32def8667a52 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.cxx +++ b/slideshow/source/engine/transitions/clippingfunctor.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include "clippingfunctor.hxx" #include "transitiontools.hxx" diff --git a/slideshow/source/engine/transitions/clockwipe.cxx b/slideshow/source/engine/transitions/clockwipe.cxx index 47b84f12aa87..647367a5ee57 100644 --- a/slideshow/source/engine/transitions/clockwipe.cxx +++ b/slideshow/source/engine/transitions/clockwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx index abd632069135..81a6bc851307 100644 --- a/slideshow/source/engine/transitions/combtransition.cxx +++ b/slideshow/source/engine/transitions/combtransition.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/slideshow/source/engine/transitions/doublediamondwipe.cxx b/slideshow/source/engine/transitions/doublediamondwipe.cxx index c6985a5a245e..499fab1a9b02 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.cxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include "doublediamondwipe.hxx" diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx index ce5a54aa4d6c..35aa9ec69a99 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.cxx +++ b/slideshow/source/engine/transitions/ellipsewipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include "ellipsewipe.hxx" diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx index 5281412d3120..5071dd62aaa1 100644 --- a/slideshow/source/engine/transitions/fanwipe.cxx +++ b/slideshow/source/engine/transitions/fanwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include "transitiontools.hxx" diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx index 331b1cece82a..cc9a2baa0014 100644 --- a/slideshow/source/engine/transitions/figurewipe.cxx +++ b/slideshow/source/engine/transitions/figurewipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/slideshow/source/engine/transitions/fourboxwipe.cxx b/slideshow/source/engine/transitions/fourboxwipe.cxx index 4e86772e695c..4df6d8199a7d 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.cxx +++ b/slideshow/source/engine/transitions/fourboxwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx index 6579ccb924d9..b14c9236331f 100644 --- a/slideshow/source/engine/transitions/iriswipe.cxx +++ b/slideshow/source/engine/transitions/iriswipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include "iriswipe.hxx" diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx index ca1d198dec3c..2f190257902d 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx +++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/animations/TransitionType.hpp> diff --git a/slideshow/source/engine/transitions/pinwheelwipe.cxx b/slideshow/source/engine/transitions/pinwheelwipe.cxx index f4efdab77efe..1ee179868049 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.cxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx index 95ae48674696..985f4209f12b 100644 --- a/slideshow/source/engine/transitions/randomwipe.cxx +++ b/slideshow/source/engine/transitions/randomwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 33fb7477fa12..8f26f35e6587 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/anytostring.hxx> diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index d78361ff5b97..0a99eeb6e719 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 754e4f060a50..fbe7001c0be4 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index 0fe917f65afe..99b34d5d3af6 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -19,7 +19,6 @@ #include <osl/diagnose.h> -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx index f7738a54bcce..f89ef9fabaff 100644 --- a/slideshow/source/engine/transitions/spiralwipe.cxx +++ b/slideshow/source/engine/transitions/spiralwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include "spiralwipe.hxx" #include "transitiontools.hxx" diff --git a/slideshow/source/engine/transitions/sweepwipe.cxx b/slideshow/source/engine/transitions/sweepwipe.cxx index 158e7a9e5240..bfb4580d6736 100644 --- a/slideshow/source/engine/transitions/sweepwipe.cxx +++ b/slideshow/source/engine/transitions/sweepwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/slideshow/source/engine/transitions/veewipe.cxx b/slideshow/source/engine/transitions/veewipe.cxx index 3da1d5de0ba1..8b1f123f957a 100644 --- a/slideshow/source/engine/transitions/veewipe.cxx +++ b/slideshow/source/engine/transitions/veewipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/point/b2dpoint.hxx> #include "veewipe.hxx" diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx index ce21b95cb8ca..5c5286f47acb 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.cxx +++ b/slideshow/source/engine/transitions/waterfallwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx index 345876fd9e14..489d11d12938 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.cxx +++ b/slideshow/source/engine/transitions/zigzagwipe.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx index 7efee4a22220..f51f104ca52e 100644 --- a/slideshow/source/engine/unoviewcontainer.cxx +++ b/slideshow/source/engine/unoviewcontainer.cxx @@ -20,7 +20,6 @@ #include <unoviewcontainer.hxx> -#include <canvas/debug.hxx> #include <osl/diagnose.h> #include <boost/bind.hpp> diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index ab31873c83cf..53f043ab03ef 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -18,8 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/anytostring.hxx> diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx index f2640659b64f..35c13963403d 100644 --- a/slideshow/source/engine/wakeupevent.cxx +++ b/slideshow/source/engine/wakeupevent.cxx @@ -18,10 +18,6 @@ */ -// must be first -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> - #include <wakeupevent.hxx> diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx index 88a5c9ab5e11..f0ab3135caf1 100644 --- a/slideshow/source/inc/animationnodefactory.hxx +++ b/slideshow/source/inc/animationnodefactory.hxx @@ -50,7 +50,7 @@ namespace slideshow const SlideShowContext& rContext ); -#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) +#if defined(DBG_UTIL) void showTree( AnimationNodeSharedPtr& pRootNode ); # define SHOW_NODE_TREE(a) AnimationNodeFactory::showTree(a) #else |