[Libreoffice-commits] .: 4 commits - sw/source

[Tor Lillqvist]

 sw/source/core/layout/virtoutp.cxx |    2 +-
 sw/source/core/text/txtfly.cxx     |    2 +-
 sw/source/core/text/txtio.cxx      |    5 +++++
 sw/source/core/view/viewsh.cxx     |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 6c67debc7edf56634c221f2e657ac65909def5a6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Nov 7 22:44:25 2010 +0200

    Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b79e9c0..55964a2 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -622,7 +622,7 @@ void ViewShell::LayoutIdle()
 
     SET_CURR_SHELL( this );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( pOpt->IsTest5() )
         return;
 #endif
commit 310d1b379e370f00c4868db9e5508f02a1f155d6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Nov 7 22:25:19 2010 +0200

    Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup

diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index f21530f..994d0a4 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -184,7 +184,7 @@ void SwLayVout::Enter(  ViewShell *pShell, SwRect &rRect, BOOL bOn )
 {
     Flush();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         if( pShell->GetViewOptions()->IsTest3() )
         {
             ++nCount;
commit 070126a07cd583a64041b72f138f35d9a629650a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Nov 7 22:23:30 2010 +0200

    Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup

diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 34b4adf..ec7eb6f 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -287,9 +287,14 @@ SvStream &operator<<( SvStream &rOs, const SwpHints & ) //$ ostream
 
 sal_Bool IsDbg( const SwTxtFrm *pFrm )
 {
+// Hmm, so IsTest4 etc are defined only if OSL_DEBUG_LEVEL > 1,
+// but this file is compiled if DBG_UTIL is defined. So should the IsTest4 etc
+// then instead be conditional on DBG_UTIL? Such crack.
+#if OSL_DEBUG_LEVEL > 1
     if( pFrm && pFrm->GetShell() )
         return pFrm->GetShell()->GetViewOptions()->IsTest4();
     else
+#else
         return sal_False;
 }
 
commit 94f34923235649365982d2302da172684febcd37
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Nov 7 22:19:54 2010 +0200

    Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup

diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 7258e41..51c5975 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -1804,7 +1804,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
 
         delete pPolyPolygon;
         // UPPER_LOWER_TEST
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         const SwRootFrm* pTmpRootFrm = pFmt->getIDocumentLayoutAccess()->GetRootFrm();
         if( pTmpRootFrm->GetCurrShell() )
         {