[Libreoffice-commits] .: 2 commits - connectivity/source sal/inc sdext/source slideshow/source svx/source
Lubos Lunak
llunak at kemper.freedesktop.org
Tue Apr 10 04:38:00 PDT 2012
connectivity/source/commontools/RowFunctionParser.cxx | 2 -
sal/inc/osl/diagnose.hxx | 13 ++++++++
sdext/source/presenter/PresenterAccessibility.cxx | 16 +---------
slideshow/source/engine/animationnodes/animationbasenode.cxx | 2 -
slideshow/source/engine/animationnodes/animationbasenode.hxx | 2 -
slideshow/source/engine/animationnodes/animationcolornode.hxx | 2 -
slideshow/source/engine/animationnodes/animationnodefactory.cxx | 2 -
slideshow/source/engine/animationnodes/animationpathmotionnode.hxx | 2 -
slideshow/source/engine/animationnodes/animationsetnode.hxx | 2 -
slideshow/source/engine/animationnodes/animationtransformnode.hxx | 2 -
slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx | 2 -
slideshow/source/engine/animationnodes/basecontainernode.cxx | 2 -
slideshow/source/engine/animationnodes/basecontainernode.hxx | 2 -
slideshow/source/engine/animationnodes/basenode.cxx | 2 -
slideshow/source/engine/animationnodes/basenode.hxx | 2 -
slideshow/source/engine/animationnodes/nodetools.cxx | 2 -
slideshow/source/engine/animationnodes/nodetools.hxx | 4 +-
slideshow/source/engine/animationnodes/paralleltimecontainer.hxx | 2 -
slideshow/source/engine/animationnodes/propertyanimationnode.hxx | 2 -
slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx | 2 -
slideshow/source/engine/shapes/viewshape.cxx | 2 -
slideshow/source/engine/slideshowimpl.cxx | 2 -
slideshow/source/engine/slideview.cxx | 6 +--
slideshow/source/engine/smilfunctionparser.cxx | 2 -
slideshow/source/inc/animationnodefactory.hxx | 2 -
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 2 -
26 files changed, 43 insertions(+), 40 deletions(-)
New commits:
commit 20662349e1b9f82c7cd372a06cba9fc4c750b723
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Tue Apr 10 13:34:48 2012 +0200
disable clang warning about something that cannot be fixed without BIC change
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 840f7a3..95f5093 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -70,8 +70,21 @@ SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject(
::osl::detail::ObjectRegistryData & rData, void const* pObj )
SAL_THROW_EXTERN_C();
+// These functions presumably should not be extern "C", but changing
+// that would break binary compatibility.
+#if SUPD < 400
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
+#endif
+#endif
SAL_DLLPUBLIC ::osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
SAL_THROW_EXTERN_C();
+#if SUPD < 400
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
} // extern "C"
commit 912e36e911201742633e7c0a0a56f247735ee09c
Author: Rob Snelders <programming at ertai.nl>
Date: Thu Apr 5 22:40:21 2012 +0200
Remove VERBOSE part 3
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index 077f9bd..0bb5f60 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -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
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 18ba0e7..ff90539 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -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);
}
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 06ec310..df1bcc5 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 b15047d..be91d77 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 68c1dc8..1fbe7e6 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 cf16955..0caeee9 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 02fbc99..0c7f98b 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 a836b9a..2205087 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 e2416b7..33c255c 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 506ab66..bd32ca3 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 fd81654..e9a53ac 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 8523d12..9ed9793 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 012d335..8150f88 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 ad2d09a..eb0aef7 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 032d79e..b4b0bbc 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 529e457..44109a1 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 abeacb7..3d9bd91 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 66232cc..b1ed11f 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 003d803..ea7ea98 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 823a516..3651fd1 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 7718019..eed2da2 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 2309c4c..edbf017 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 c1b630e..c7f64cf 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 30a278e..da7e01a 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
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 67b5a08..753bdbd 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -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
More information about the Libreoffice-commits
mailing list