summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorRohan Kumar <rohankanojia420@gmail.com>2016-03-09 17:02:48 +0530
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2016-04-05 11:01:02 +0000
commit0161f713c722392796347cf12d94423e218bdc4c (patch)
tree7a6905c6bb37f92bb03bfd62e064af33e21ba744 /slideshow
parent7605d173988e8df19830bfe4e0d00e745f09d9a0 (diff)
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I blindly replaced OSL_DEBUG_LEVEL > 1 conditionals to OSL_DEBUG_LEVEL > 0 as suggested in the easy hack Change-Id: Iac829aa648fd0bd5d170e92a72809a2078e1f020 Reviewed-on: https://gerrit.libreoffice.org/23066 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx16
-rw-r--r--slideshow/source/inc/delayevent.hxx2
2 files changed, 9 insertions, 9 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 393675bd5dd9..17e501af4118 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -76,7 +76,7 @@
#include <vcl/sysdata.hxx>
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
#include <boost/date_time/posix_time/posix_time.hpp>
using namespace ::boost::posix_time;
@@ -95,7 +95,7 @@ namespace
typedef cppu::WeakComponentImplHelper<presentation::XTransition> OGLTransitionerImplBase;
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
class TimerContext
{
public:
@@ -299,7 +299,7 @@ public:
*/
bool mbHasTFPVisual;
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
ptime maUpdateStartTime;
ptime maUpdateEndTime;
ptime maStartTime;
@@ -350,7 +350,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
if( !mxView.is() )
return false;
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
TimerContext aTimerContext("initWindowFromSlideShowView");
#endif
@@ -1155,7 +1155,7 @@ void OGLTransitionerImpl::GLInitSlides()
if (isDisposed() || !mpTransition || mpTransition->getSettings().mnRequiredGLVersion > mnGLVersion)
return;
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
TimerContext aTimerContext("texture creation");
#endif
@@ -1191,7 +1191,7 @@ void OGLTransitionerImpl::GLInitSlides()
void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeException, std::exception)
{
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
mnFrameCount ++;
maUpdateStartTime = microsec_clock::local_time();
if( mnFrameCount == 1 ) {
@@ -1223,7 +1223,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
mpContext->sync();
CHECK_GL_ERROR();
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
maUpdateEndTime = microsec_clock::local_time();
SAL_INFO("slideshow.opengl", "update time: " << nTime);
@@ -1308,7 +1308,7 @@ void OGLTransitionerImpl::disposing()
{
osl::MutexGuard const guard( m_aMutex );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
SAL_INFO("slideshow.opengl", "dispose " << this);
if( mnFrameCount ) {
maEndTime = microsec_clock::local_time();
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 2e99ab711004..fd43d2991ea7 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -98,7 +98,7 @@ inline EventSharedPtr makeEvent_( FuncT const& func, OUString const& rsDescripti
#define makeDelay(f, t, d) makeDelay_(f, t, d)
#define makeEvent(f, d) makeEvent_(f, d)
-#else // OSL_DEBUG_LEVEL > 1
+#else // OSL_DEBUG_LEVEL > 0
class Delay_ : public Delay {
public: