[Libreoffice-commits] core.git: slideshow/source

[Rohan Kumar]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |   16 
+++++-----
 slideshow/source/inc/delayevent.hxx                                    |    2 -
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0161f713c722392796347cf12d94423e218bdc4c
Author: Rohan Kumar <rohankanojia...@gmail.com>
Date:   Wed Mar 9 17:02:48 2016 +0530

    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 <c...@libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 393675b..17e501a 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 2e99ab7..fd43d29 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:

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits