Fix --enable-debug --disable-dbgutil.

3 files changed, 58 insertions, 6 deletions

diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 649a5f74a..b1f75213e 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -844,6 +844,8 @@ namespace binfilter {
 /*N*/                           BOOL /*bKeepScenarioFlags*/, BOOL /*bIncludeObjects*/)
 /*N*/ {
 /*N*/   DBG_ASSERT( bAllTabs || pMarks, "CopyToClip: ScMarkData fehlt" );
+        (void) bAllTabs; // avoid warnings
+        (void) pMarks; // avoid warnings
 /*N*/
 /*N*/   if (!bIsClip)
 /*N*/   {
diff --git a/binfilter/bf_sw/source/core/inc/drawfont.hxx b/binfilter/bf_sw/source/core/inc/drawfont.hxx
index f7db89ee2..cf9260e73 100644
--- a/binfilter/bf_sw/source/core/inc/drawfont.hxx
+++ b/binfilter/bf_sw/source/core/inc/drawfont.hxx
@@ -337,13 +337,17 @@ public:
 
     OutputDevice& GetOut() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bOut, "DrawTextInfo: Undefined Outputdevice" );
+#endif
         return *pOut;
     }
 
     OutputDevice *GetpOut() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bOut, "DrawTextInfo: Undefined Outputdevice" );
+#endif
         return pOut;
     }
 
@@ -354,98 +358,130 @@ public:
 
     const Point &GetPos() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bPos, "DrawTextInfo: Undefined Position" );
+#endif
         return *pPos;
     }
 
     xub_StrLen *GetHyphPos() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bHyph, "DrawTextInfo: Undefined Hyph Position" );
+#endif
         return pHyphPos;
     }
 
     const XubString &GetText() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bText, "DrawTextInfo: Undefined String" );
+#endif
         return *pText;
     }
 
     const SwWrongList* GetWrong() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bWrong, "DrawTextInfo: Undefined WrongList" );
+#endif
         return pWrong;
     }
 
     const Size &GetSize() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bSize, "DrawTextInfo: Undefined Size" );
+#endif
         return *pSize;
     }
 
     SwFont* GetFont() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bFnt, "DrawTextInfo: Undefined Font" );
+#endif
         return pFnt;
     }
 
     SwUnderlineFont* GetUnderFnt() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bSpec, "DrawTextInfo: Undefined Underlinefont" );
+#endif
         return pUnderFnt;
     }
 
     xub_StrLen GetIdx() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bIdx, "DrawTextInfo: Undefined Index" );
+#endif
         return nIdx;
     }
 
     xub_StrLen GetLen() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bLen, "DrawTextInfo: Undefined Length" );
+#endif
         return nLen;
     }
 
     xub_StrLen GetOfst() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bOfst, "DrawTextInfo: Undefined Offset" );
+#endif
         return nOfst;
     }
 
     xub_StrLen GetEnd() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bIdx, "DrawTextInfo: Undefined Index" );
         OSL_ENSURE( bLen, "DrawTextInfo: Undefined Length" );
+#endif
         return nIdx + nLen;
     }
 
     long GetLeft() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bLeft, "DrawTextInfo: Undefined left range" );
+#endif
         return nLeft;
     }
 
     long GetRight() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bRight, "DrawTextInfo: Undefined right range" );
+#endif
         return nRight;
     }
 
     long GetKanaDiff() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bKana, "DrawTextInfo: Undefined kana difference" );
+#endif
         return nKanaDiff;
     }
 
     USHORT GetWidth() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bWidth, "DrawTextInfo: Undefined Width" );
+#endif
         return nWidth;
     }
 
     USHORT GetAscent() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bAscent, "DrawTextInfo: Undefined Ascent" );
+#endif
         return nAscent;
     }
 
@@ -456,19 +492,25 @@ public:
 
     short GetSperren() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bSperr, "DrawTextInfo: Undefined >Sperren<" );
+#endif
         return nSperren;
     }
 
     short GetKern() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bKern, "DrawTextInfo: Undefined Kerning" );
+#endif
         return nKern;
     }
 
     short GetSpace() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bSpace, "DrawTextInfo: Undefined Spacing" );
+#endif
         return nSpace;
     }
 
@@ -479,25 +521,33 @@ public:
 
     BOOL GetBullet() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bBull, "DrawTextInfo: Undefined Bulletflag" );
+#endif
         return bBullet;
     }
 
     BOOL GetUpper() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bUppr, "DrawTextInfo: Undefined Upperflag" );
+#endif
         return bUpper;
     }
 
     BOOL GetDrawSpace() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" );
+#endif
         return bDrawSpace;
     }
 
     BOOL GetGreyWave() const
     {
+#if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bGreyWv, "DrawTextInfo: Undefined GreyWave" );
+#endif
         return bGreyWave;
     }
 
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
index 13492746d..46c47b737 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
@@ -52,7 +52,7 @@
 namespace binfilter {
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
 static ULONG nCntntBox = 0;
 #endif
 
@@ -142,7 +142,7 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
 /*N*/ {
 /*N*/   Sw3FrmFmts *pOldTblLineBoxFmts = pTblLineBoxFmts;
 /*N*/   pTblLineBoxFmts = 0;
-/*N*/ #ifdef DBG_UTIL
+/*N*/ #if OSL_DEBUG_LEVEL > 0
 /*N*/   ULONG nOldCntntBox = nCntntBox;
 /*N*/ #endif
 /*N*/
@@ -237,7 +237,7 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
 /*N*/           // Die einzelnen Zeilen einlesen
 /*N*/           // aIdx zeigt auf den Startnode der ersten Box
 /*N*/           rPos = *pNd; rPos++;
-/*N*/ #ifdef DBG_UTIL
+/*N*/ #if OSL_DEBUG_LEVEL > 0
 /*N*/           nCntntBox = 0;
 /*N*/ #endif
 /*N*/           USHORT nLine = 0;
@@ -267,7 +267,7 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
 /*N*/
 /*N*/   delete pTblLineBoxFmts;
 /*N*/   pTblLineBoxFmts = pOldTblLineBoxFmts;
-/*N*/ #ifdef DBG_UTIL
+/*N*/ #if OSL_DEBUG_LEVEL > 0
 /*N*/   nCntntBox = nOldCntntBox;
 /*N*/ #endif
 /*N*/ }
@@ -394,7 +394,7 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
 /*N*/           // jetzt die entsprechende Aktualisierung erfolgen.
 /*N*/           pBox->ChgByLanguageSystem();
 /*N*/
-/*N*/ #ifdef DBG_UTIL
+/*N*/ #if OSL_DEBUG_LEVEL > 0
 /*N*/           ++nCntntBox;
 /*N*/ #endif
 /*N*/       }
@@ -415,7 +415,7 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
 /*?*/               delete pBox;
 /*?*/               pBox = pNewBox;
 /*?*/               rPos = pBox->GetSttNd()->EndOfSectionIndex() + 1;
-/*?*/ #ifdef DBG_UTIL
+/*?*/ #if OSL_DEBUG_LEVEL > 0
 /*?*/               OSL_ENSURE( !this, "Tabellenzelle ohne Lines und ohne Content" );
 /*?*/               ++nCntntBox;
 /*?*/ #endif