Remove VERBOSE part 3

22 files changed, 25 insertions, 25 deletions

diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 06ec310104ab..df1bcc5b9f83 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -377,7 +377,7 @@ bool AnimationBaseNode::hasPendingAnimation() const
     return true;
 }
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
 void AnimationBaseNode::showState() const
 {
     BaseNode::showState();
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index b15047d78c4f..be91d77750d1 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -53,7 +53,7 @@ public:
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext );
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual void showState() const;
 #endif
 
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx
index 68c1dc856823..1fbe7e688a50 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx
@@ -46,7 +46,7 @@ public:
         : AnimationBaseNode( xNode, pParent, rContext ),
           mxColorNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual const char* getDescription() const { return "AnimationColorNode"; }
 #endif
 
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index cf169557e901..0caeee9e3714 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -604,7 +604,7 @@ AnimationNodeSharedPtr AnimationNodeFactory::createAnimationNode(
                                                rSlideSize )));
 }
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
 void AnimationNodeFactory::showTree( AnimationNodeSharedPtr& pRootNode )
 {
     if( pRootNode )
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
index 02fbc99fab83..0c7f98b79744 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
@@ -45,7 +45,7 @@ public:
         : AnimationBaseNode( xNode, rParent, rContext ),
           mxPathMotionNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual const char* getDescription() const
         { return "AnimationPathMotionNode"; }
 #endif
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx
index a836b9ae0f38..2205087b9fbd 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -43,7 +43,7 @@ public:
         NodeContext const& rContext )
         : AnimationBaseNode( xNode, pParent, rContext ) {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual const char* getDescription() const { return "AnimationSetNode"; }
 #endif
 
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
index e2416b72a7f3..33c255ceb203 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
@@ -46,7 +46,7 @@ public:
         : AnimationBaseNode( xNode, pParent, rContext ),
           mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual const char* getDescription() const
         { return "AnimationTransformNode"; }
 #endif
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
index 506ab668050c..bd32ca394368 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
@@ -47,7 +47,7 @@ public:
           mxTransitionFilterNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW)
         {}
 
-#if defined(VERBOSE)
+#if OSL_DEBUG_LEVEL >= 2
     virtual const char* getDescription() const
         { return "AnimationTransitionFilterNode"; }
 #endif
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index fd816544f0c7..e9a53ac12bca 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -150,7 +150,7 @@ bool BaseContainerNode::notifyDeactivatedChild(
     return bFinished;
 }
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
 void BaseContainerNode::showState() const
 {
     for( std::size_t i=0; i<maChildren.size(); ++i )
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx
index 8523d122f722..9ed9793a615b 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx
@@ -49,7 +49,7 @@ public:
      */
     void appendChildNode( AnimationNodeSharedPtr const& pNode );
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && 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 012d335c4fdb..8150f885f105 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -686,7 +686,7 @@ void BaseNode::setSelf( const BaseNodeSharedPtr& rSelf )
 // Debug
 //=========================================================================
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
 void BaseNode::showState() const
 {
     const AnimationNode::NodeState eNodeState( getState() );
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index ad2d09a59e78..eb0aef7cdf94 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -109,7 +109,7 @@ public:
     void setSelf( const ::boost::shared_ptr< BaseNode >& rSelf );
 
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual void showState() const;
     virtual const char* getDescription() const;
     void showTreeFromWithin() const;
diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx
index 032d79e1eb6a..b4b0bbc364fa 100644
--- a/slideshow/source/engine/animationnodes/nodetools.cxx
+++ b/slideshow/source/engine/animationnodes/nodetools.cxx
@@ -43,7 +43,7 @@ namespace slideshow
 {
     namespace internal
     {
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && 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 529e45711808..44109a175235 100644
--- a/slideshow/source/engine/animationnodes/nodetools.hxx
+++ b/slideshow/source/engine/animationnodes/nodetools.hxx
@@ -39,7 +39,7 @@
 #include "attributableshape.hxx"
 
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
 # define DEBUG_NODES_SHOWTREE(a) debugNodesShowTree(a);
 # define DEBUG_NODES_SHOWTREE_WITHIN(a) debugNodesShowTreeWithin(a);
 #else
@@ -55,7 +55,7 @@ namespace slideshow
         // Tools
         //=========================================================================
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
         int& debugGetCurrentOffset();
         void debugNodesShowTree( const BaseNode* );
         void debugNodesShowTreeWithin( const BaseNode* );
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
index abeacb7cda6f..3d9bd914960a 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
@@ -47,7 +47,7 @@ public:
         const NodeContext&                              rContext )
         : BaseContainerNode( xNode, rParent, rContext ) {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual const char* getDescription() const
         { return "ParallelTimeContainer"; }
 #endif
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
index 66232ccf8063..b1ed11feb497 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
@@ -43,7 +43,7 @@ public:
         NodeContext const& rContext )
         : AnimationBaseNode( xNode, pParent, rContext ) {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual const char* getDescription() const
         { return "PropertyAnimationNode"; }
 #endif
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index 003d80333074..ea7ea9859903 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -47,7 +47,7 @@ public:
         NodeContext const& rContext )
         : BaseContainerNode( xNode, pParent, rContext ) {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     virtual const char* getDescription() const
         { return "SequentialTimeContainer"; }
 #endif
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 823a516ada4c..3651fd1d207f 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -205,7 +205,7 @@ namespace slideshow
             ENSURE_OR_RETURN_FALSE( pRenderer, "ViewShape::draw(): Invalid renderer" );
 
             pRenderer->setTransformation( rTransform );
-#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL >= 2
             rendering::RenderState aRenderState;
             ::canvas::tools::initRenderState(aRenderState);
             ::canvas::tools::setRenderStateTransform(aRenderState,
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 77180192c1bc..eed2da2eba19 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2095,7 +2095,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
             mbSlideShowIdle = false;
         }
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && 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 2309c4cf7b91..edbf017c9d1d 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -210,7 +210,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas,
         pPolyPoly->draw();
     }
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
     ::cppcanvas::CanvasSharedPtr pCliplessCanvas( pCanvas->clone() );
     pCliplessCanvas->setClip();
 
@@ -218,7 +218,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas,
     {
         ::cppcanvas::PolyPolygonSharedPtr pPolyPoly2(
             ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( pCliplessCanvas,
-                                                                          *(pCanvas->getClip()) ));
+                                                                          aPoly ));
         if( pPolyPoly2 )
         {
             pPolyPoly2->setRGBALineColor( 0x008000FFU );
@@ -610,7 +610,7 @@ private:
                 mpSprite->setPriority(
                     maSpriteContainer.getLayerPriority().getMinimum() );
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && 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 c1b630eabb41..c7f64cfb1a1a 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -53,7 +53,7 @@
 #endif
 #include <boost/spirit/include/classic_core.hpp>
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL >= 2
 #include <iostream>
 #endif
 #include <functional>
diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx
index 30a278e9f57a..da7e01a26d44 100644
--- a/slideshow/source/inc/animationnodefactory.hxx
+++ b/slideshow/source/inc/animationnodefactory.hxx
@@ -61,7 +61,7 @@ namespace slideshow
                                                                const SlideShowContext&                              rContext );
 
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
             static void showTree( AnimationNodeSharedPtr& pRootNode );
 # define SHOW_NODE_TREE(a) AnimationNodeFactory::showTree(a)
 #else