3 files changed, 8 insertions, 9 deletions
diff --git a/slideshow/source/engine/debug.cxx b/slideshow/source/engine/debug.cxx
index 36bb8c9e106b..75d1c30d5013 100644
--- a/slideshow/source/engine/debug.cxx
+++ b/slideshow/source/engine/debug.cxx
@@ -31,6 +31,9 @@
 #include "precompiled_slideshow.hxx"
 
 #include "debug.hxx"
+
+#if OSL_DEBUG_LEVEL > 1
+
 #include "animationnodes/basecontainernode.hxx"
 #include "animationnodes/paralleltimecontainer.hxx"
 #include "animationnodes/sequentialtimecontainer.hxx"
@@ -52,9 +55,8 @@
 using ::rtl::OUString;
 using namespace ::com::sun::star;
 
-namespace slideshow { namespace internal {
 
-#if OSL_DEBUG_LEVEL > 1
+namespace slideshow { namespace internal {
 
 namespace {
 
@@ -221,15 +223,11 @@ void Debug_ShowNodeTree (const AnimationNodeSharedPtr& rpNode)
     DebugShowState(DebugGetTreeRoot(::boost::dynamic_pointer_cast<BaseNode>(rpNode)));
 }
 
-#endif //  OSL_DEBUG_LEVEL > 1
-
 
 
 
 //----- Tracing ---------------------------------------------------------------
 
-#if OSL_DEBUG_LEVEL > 1
-
 extern "C" {
 
     namespace {
@@ -323,6 +321,7 @@ DebugTraceScope::~DebugTraceScope (void)
     delete [] msMessage;
 }
 
-#endif // OSL_DEBUG_LEVEL > 1
 
 } }
+
+#endif // OSL_DEBUG_LEVEL > 1
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index c17dadc3ac5b..90efe8b5aedd 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -72,7 +72,7 @@ public:
     WakeupEvent( boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
                  ActivitySharedPtr const&                                 rActivity,
                  ActivitiesQueue &                                        rActivityQueue ) :
-#if OSL_DEBUG_LEVEL > 1 && defined (SLIDESHOW_ADD_DESCRIPTIONS_TO_EVENTS)
+#if OSL_DEBUG_LEVEL > 1
         Event(::rtl::OUString::createFromAscii("WakeupEvent")),
 #endif
         maTimer(pTimeBase),
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 31ea8956c17b..d2e13d188e14 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -45,7 +45,7 @@ namespace slideshow
         WakeupEvent::WakeupEvent(
             boost::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
             ActivitiesQueue& rActivityQueue ) :
-#if OSL_DEBUG_LEVEL > 1 && defined (SLIDESHOW_ADD_DESCRIPTIONS_TO_EVENTS)
+#if OSL_DEBUG_LEVEL > 1
             Event(::rtl::OUString::createFromAscii("WakeupEvent")),
 #endif
             maTimer(pTimeBase),