From e5ec6304149cdcad0d6495b5187c245748b408b5 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Mon, 10 Aug 2015 14:04:31 -0500
Subject: 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>
---
 slideshow/source/engine/activities/activitiesfactory.cxx       |  3 ---
 slideshow/source/engine/activities/activitybase.cxx            |  3 ---
 slideshow/source/engine/activities/continuousactivitybase.cxx  |  4 ----
 .../source/engine/activities/continuouskeytimeactivitybase.cxx |  3 ---
 slideshow/source/engine/activities/discreteactivitybase.cxx    |  3 ---
 .../source/engine/activities/simplecontinuousactivitybase.cxx  |  2 --
 slideshow/source/engine/activitiesqueue.cxx                    |  4 ----
 slideshow/source/engine/animatedsprite.cxx                     |  2 --
 slideshow/source/engine/animationfactory.cxx                   |  3 ---
 slideshow/source/engine/animationnodes/animationaudionode.cxx  |  4 ----
 slideshow/source/engine/animationnodes/animationbasenode.cxx   |  5 +----
 slideshow/source/engine/animationnodes/animationbasenode.hxx   |  2 +-
 slideshow/source/engine/animationnodes/animationcolornode.cxx  |  3 ---
 slideshow/source/engine/animationnodes/animationcolornode.hxx  |  2 +-
 .../source/engine/animationnodes/animationcommandnode.cxx      |  3 ---
 .../source/engine/animationnodes/animationnodefactory.cxx      |  6 +-----
 .../source/engine/animationnodes/animationpathmotionnode.cxx   |  4 ----
 .../source/engine/animationnodes/animationpathmotionnode.hxx   |  2 +-
 slideshow/source/engine/animationnodes/animationsetnode.cxx    |  3 ---
 slideshow/source/engine/animationnodes/animationsetnode.hxx    |  2 +-
 .../source/engine/animationnodes/animationtransformnode.cxx    |  3 ---
 .../source/engine/animationnodes/animationtransformnode.hxx    |  2 +-
 .../engine/animationnodes/animationtransitionfilternode.cxx    |  4 ----
 slideshow/source/engine/animationnodes/basecontainernode.cxx   | 10 +++-------
 slideshow/source/engine/animationnodes/basecontainernode.hxx   |  2 +-
 slideshow/source/engine/animationnodes/basenode.cxx            | 10 +++-------
 slideshow/source/engine/animationnodes/basenode.hxx            |  3 +--
 slideshow/source/engine/animationnodes/generateevent.cxx       |  3 ---
 slideshow/source/engine/animationnodes/nodetools.cxx           |  6 +-----
 slideshow/source/engine/animationnodes/nodetools.hxx           |  4 ++--
 .../source/engine/animationnodes/paralleltimecontainer.hxx     |  2 +-
 .../source/engine/animationnodes/propertyanimationnode.cxx     |  4 ----
 .../source/engine/animationnodes/propertyanimationnode.hxx     |  2 +-
 .../source/engine/animationnodes/sequentialtimecontainer.cxx   |  3 ---
 .../source/engine/animationnodes/sequentialtimecontainer.hxx   |  2 +-
 slideshow/source/engine/animationnodes/setactivity.hxx         |  3 ---
 slideshow/source/engine/attributemap.cxx                       |  2 --
 slideshow/source/engine/eventmultiplexer.cxx                   |  2 --
 slideshow/source/engine/eventqueue.cxx                         |  3 ---
 slideshow/source/engine/expressionnodefactory.cxx              |  4 ----
 slideshow/source/engine/shapeattributelayer.cxx                |  4 ----
 slideshow/source/engine/shapes/appletshape.cxx                 |  3 ---
 slideshow/source/engine/shapes/backgroundshape.cxx             |  3 ---
 slideshow/source/engine/shapes/drawinglayeranimation.cxx       |  1 -
 slideshow/source/engine/shapes/drawshape.cxx                   |  3 ---
 slideshow/source/engine/shapes/drawshapesubsetting.cxx         |  3 ---
 slideshow/source/engine/shapes/externalshapebase.cxx           |  2 --
 slideshow/source/engine/shapes/gdimtftools.cxx                 |  2 --
 slideshow/source/engine/shapes/intrinsicanimationactivity.cxx  |  2 --
 slideshow/source/engine/shapes/mediashape.cxx                  |  3 ---
 slideshow/source/engine/shapes/shapeimporter.cxx               |  2 --
 slideshow/source/engine/shapes/viewappletshape.cxx             |  3 ---
 slideshow/source/engine/shapes/viewbackgroundshape.cxx         |  2 --
 slideshow/source/engine/shapes/viewmediashape.cxx              |  2 --
 slideshow/source/engine/shapes/viewshape.cxx                   |  3 ---
 slideshow/source/engine/shapesubset.cxx                        |  1 -
 slideshow/source/engine/slide/layer.cxx                        |  3 ---
 slideshow/source/engine/slide/layermanager.cxx                 |  1 -
 slideshow/source/engine/slide/shapemanagerimpl.cxx             |  1 -
 slideshow/source/engine/slide/slideanimations.cxx              |  2 --
 slideshow/source/engine/slide/slideimpl.cxx                    |  1 -
 slideshow/source/engine/slide/userpaintoverlay.cxx             |  2 --
 slideshow/source/engine/slidebitmap.cxx                        |  2 --
 slideshow/source/engine/slideshowimpl.cxx                      |  3 +--
 slideshow/source/engine/slideview.cxx                          |  5 ++---
 slideshow/source/engine/smilfunctionparser.cxx                 |  5 -----
 slideshow/source/engine/soundplayer.cxx                        |  2 --
 slideshow/source/engine/sp_debug.cxx                           |  1 -
 slideshow/source/engine/tools.cxx                              |  1 -
 slideshow/source/engine/transitions/barndoorwipe.cxx           |  1 -
 slideshow/source/engine/transitions/barwipepolypolygon.cxx     |  1 -
 slideshow/source/engine/transitions/boxwipe.cxx                |  1 -
 slideshow/source/engine/transitions/checkerboardwipe.cxx       |  1 -
 slideshow/source/engine/transitions/clippingfunctor.cxx        |  1 -
 slideshow/source/engine/transitions/clockwipe.cxx              |  1 -
 slideshow/source/engine/transitions/combtransition.cxx         |  1 -
 slideshow/source/engine/transitions/doublediamondwipe.cxx      |  1 -
 slideshow/source/engine/transitions/ellipsewipe.cxx            |  1 -
 slideshow/source/engine/transitions/fanwipe.cxx                |  1 -
 slideshow/source/engine/transitions/figurewipe.cxx             |  1 -
 slideshow/source/engine/transitions/fourboxwipe.cxx            |  1 -
 slideshow/source/engine/transitions/iriswipe.cxx               |  1 -
 .../source/engine/transitions/parametricpolypolygonfactory.cxx |  1 -
 slideshow/source/engine/transitions/pinwheelwipe.cxx           |  1 -
 slideshow/source/engine/transitions/randomwipe.cxx             |  1 -
 slideshow/source/engine/transitions/shapetransitionfactory.cxx |  1 -
 slideshow/source/engine/transitions/slidechangebase.cxx        |  1 -
 slideshow/source/engine/transitions/slidetransitionfactory.cxx |  1 -
 slideshow/source/engine/transitions/snakewipe.cxx              |  1 -
 slideshow/source/engine/transitions/spiralwipe.cxx             |  1 -
 slideshow/source/engine/transitions/sweepwipe.cxx              |  1 -
 slideshow/source/engine/transitions/veewipe.cxx                |  1 -
 slideshow/source/engine/transitions/waterfallwipe.cxx          |  1 -
 slideshow/source/engine/transitions/zigzagwipe.cxx             |  1 -
 slideshow/source/engine/unoviewcontainer.cxx                   |  1 -
 slideshow/source/engine/usereventqueue.cxx                     |  2 --
 slideshow/source/engine/wakeupevent.cxx                        |  4 ----
 97 files changed, 24 insertions(+), 213 deletions(-)

(limited to 'slideshow/source/engine')

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>
 
 
-- 
cgit