Remove VERBOSE part 3
This commit is contained in:
parent
1ae4c87367
commit
912e36e911
25 changed files with 30 additions and 40 deletions
|
@ -32,7 +32,7 @@
|
|||
// But watch out, the parser might have
|
||||
// state not visible to this code!
|
||||
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
|
||||
#if defined(VERBOSE) && defined(DBG_UTIL)
|
||||
#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
|
||||
#include <typeinfo>
|
||||
#define BOOST_SPIRIT_DEBUG
|
||||
#endif
|
||||
|
|
|
@ -59,8 +59,6 @@ using ::rtl::OUString;
|
|||
|
||||
#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)))
|
||||
|
||||
#define VERBOSE
|
||||
|
||||
//===== PresenterAccessibleObject =============================================
|
||||
|
||||
namespace sdext { namespace presenter {
|
||||
|
@ -784,12 +782,8 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve
|
|||
throw (cssu::RuntimeException)
|
||||
{
|
||||
(void)rEvent;
|
||||
|
||||
#ifdef VERBOSE
|
||||
OSL_TRACE("PresenterAccessible::focusGained at %x and window %x\r", this,
|
||||
mxMainWindow.get());
|
||||
#endif
|
||||
|
||||
SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusGained at " << this
|
||||
<< " and window " << mxMainWindow.get());
|
||||
AccessibleFocusManager::Instance()->FocusObject(mpAccessibleConsole);
|
||||
}
|
||||
|
||||
|
@ -797,11 +791,7 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent
|
|||
throw (cssu::RuntimeException)
|
||||
{
|
||||
(void)rEvent;
|
||||
|
||||
#ifdef VERBOSE
|
||||
OSL_TRACE("PresenterAccessible::focusLost at %x\r", this);
|
||||
#endif
|
||||
|
||||
SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusLost at " << this);
|
||||
AccessibleFocusManager::Instance()->FocusObject(NULL);
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 )
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 )
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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() );
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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* );
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) );
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
// state not visible to this code!
|
||||
|
||||
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
|
||||
#if defined(VERBOSE) && defined(DBG_UTIL)
|
||||
#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
|
||||
#include <typeinfo>
|
||||
#define BOOST_SPIRIT_DEBUG
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue