sw: replace abuses of OSL_DEBUG_LEVEL with DBG_UTIL

OSL_DEBUG_LEVEL is set by make debug=t, which should never result in ABI
incompatible objects.

3 files changed, 17 insertions, 15 deletions

diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 1c3a9fb14adf..7beb6423eee0 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -63,7 +63,7 @@
 #include <htmlnum.hxx>
 #include <wrthtml.hxx>
 #include <wrtswtbl.hxx>
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
 #include <viewsh.hxx>
 #include <viewopt.hxx>
 #endif
@@ -1213,11 +1213,13 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
 
     const SwHTMLTableLayout *pLayout = rTbl.GetHTMLTableLayout();
 
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
+    {
     ViewShell *pSh;
     rWrt.pDoc->GetEditShell( &pSh );
     if ( pSh && pSh->GetViewOptions()->IsTest1() )
         pLayout = 0;
+    }
 #endif
 
     if( pLayout && pLayout->IsExportable() )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index f22418d27bc1..94f1d28b5371 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -302,8 +302,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
     nContextStAttrMin( 0 ),
     nOpenParaToken( 0 ),
     eJumpTo( JUMPTO_NONE ),
-#if OSL_DEBUG_LEVEL > 1
-    nContinue( 0 ),
+#ifdef DBG_UTIL
+    m_nContinue( 0 ),
 #endif
     eParaAdjust( SVX_ADJUST_END ),
     bDocInitalized( sal_False ),
@@ -436,8 +436,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
 
 SwHTMLParser::~SwHTMLParser()
 {
-#if OSL_DEBUG_LEVEL > 1
-    OSL_ENSURE( !nContinue, "DTOR im Continue - Das geht schief!!!" );
+#ifdef DBG_UTIL
+    OSL_ENSURE( !m_nContinue, "DTOR im Continue!" );
 #endif
     sal_Bool bAsync = pDoc->IsInLoadAsynchron();
     pDoc->SetInLoadAsynchron( sal_False );
@@ -585,9 +585,9 @@ SvParserState SwHTMLParser::CallParser()
 
 void SwHTMLParser::Continue( int nToken )
 {
-#if OSL_DEBUG_LEVEL > 1
-    OSL_ENSURE( !nContinue, "Continue im Continue - Das sollte doch nicht sein, oder?" );
-    nContinue++;
+#ifdef DBG_UTIL
+    OSL_ENSURE(!m_nContinue, "Continue im Continue - not supposed to happen");
+    m_nContinue++;
 #endif
 
     // Wenn der Import (vom SFX) abgebrochen wurde, wird ein Fehler
@@ -611,8 +611,8 @@ void SwHTMLParser::Continue( int nToken )
         bViewCreated = sal_True;
         pDoc->SetInLoadAsynchron( sal_True );
 
-#if OSL_DEBUG_LEVEL > 1
-        nContinue--;
+#ifdef DBG_UTIL
+        m_nContinue--;
 #endif
 
         return;
@@ -920,8 +920,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() )
     // wieder rekonstruieren.
     CallEndAction( sal_True );
 
-#if OSL_DEBUG_LEVEL > 1
-    nContinue--;
+#ifdef DBG_UTIL
+    m_nContinue--;
 #endif
 }
 
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index f218c361328b..18cdd98f962b 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -445,8 +445,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
                         JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo;
 
-#if OSL_DEBUG_LEVEL > 1
-    sal_uInt16  nContinue;          // Tiefe der Continue-Aufrufe
+#ifdef DBG_UTIL
+    sal_uInt16  m_nContinue;        // depth of Continue calls
 #endif
 
     SvxAdjust   eParaAdjust;    // Ausrichtung des aktuellen Absatz