Move EDITDEBUG relics to OSL_DEBUG_LEVEL=3

6 files changed, 16 insertions, 26 deletions

diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index c846e9cfb4a4..cb722b3a6b65 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -41,12 +41,6 @@ $(eval $(call gb_Library_add_defs,editeng,\
     -DEDITENG_DLLIMPLEMENTATION \
 ))
 
-ifneq ($(strip $(EDITDEBUG)),)
-$(eval $(call gb_Library_add_defs,editeng,\
-    -DEDITDEBUG \
-))
-endif
-
 $(eval $(call gb_Library_add_api,editeng,\
 	udkapi \
 	offapi \
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 82f49c24d733..c0b19179a393 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -841,8 +841,8 @@ void ContentNode::ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNew, SfxItemPool
         pWrongList->TextInserted( nIndex, nNew, bSep );
     }
 
-#ifdef EDITDEBUG
-    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Expand: Start List distorted" );
+#if OSL_DEBUG_LEVEL > 2
+    OSL_ENSURE( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Expand: Start List distorted" );
 #endif
 }
 
@@ -929,8 +929,8 @@ void ContentNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted, SfxIte
     if ( pWrongList )
         pWrongList->TextDeleted( nIndex, nDeleted );
 
-#ifdef EDITDEBUG
-    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Collaps: Start list distorted" );
+#if OSL_DEBUG_LEVEL > 2
+    OSL_ENSURE( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Collaps: Start list distorted" );
 #endif
 }
 
@@ -991,8 +991,8 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
 
     sal_uInt16 nNewStart = Len();
 
-#ifdef EDITDEBUG
-    DBG_ASSERT( aCharAttribList.DbgCheckAttribs(), "Attribute before AppendAttribs broken" );
+#if OSL_DEBUG_LEVEL > 2
+    OSL_ENSURE( aCharAttribList.DbgCheckAttribs(), "Attribute before AppendAttribs broken" );
 #endif
 
     sal_uInt16 nAttr = 0;
@@ -1038,8 +1038,8 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
     // For the Attributes that just moved over:
     pNextNode->GetCharAttribs().Clear();
 
-#ifdef EDITDEBUG
-    DBG_ASSERT( aCharAttribList.DbgCheckAttribs(), "Attribute after AppendAttribs broken" );
+#if OSL_DEBUG_LEVEL > 2
+    OSL_ENSURE( aCharAttribList.DbgCheckAttribs(), "Attribute after AppendAttribs broken" );
 #endif
 }
 
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index df8d6d5e810d..06b166a81777 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2239,7 +2239,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16
 
     aTmpPortionList.Remove( 0, aTmpPortionList.Count() );   // important !
 
-#ifdef EDITDEBUG
+#if OSL_DEBUG_LEVEL > 2
     GetParaPortions().DbgCheck(aEditDoc);
 #endif
     return aSelection;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index b43444d4efda..74eb81ad9130 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2347,8 +2347,8 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16& r
     }
 
     DBG_ASSERT( pParaPortion->GetTextPortions().Count(), "No Portions?!" );
-#ifdef EDITDEBUG
-    DBG_ASSERT( pParaPortion->DbgCheckTextPortions(), "Portion is broken?" );
+#if OSL_DEBUG_LEVEL > 2
+    OSL_ENSURE( pParaPortion->DbgCheckTextPortions(), "Portion is broken?" );
 #endif
 }
 
@@ -2463,8 +2463,8 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* pParaPortion, sal_uInt16 nSt
             delete pTP;
         }
     }
-#ifdef EDITDEBUG
-    DBG_ASSERT( pParaPortion->DbgCheckTextPortions(), "Portions are broken?" );
+#if OSL_DEBUG_LEVEL > 2
+    OSL_ENSURE( pParaPortion->DbgCheckTextPortions(), "Portions are broken?" );
 #endif
 }
 
@@ -2956,7 +2956,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                     bDrawFrame = sal_True;
                                 }
 
-#ifdef EDITDEBUG
+#if OSL_DEBUG_LEVEL > 2
                                 if ( pTextPortion->GetKind() == PORTIONKIND_HYPHENATOR )
                                 {
                                     aTmpFont.SetFillColor( COL_LIGHTGRAY );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 272d0bef7b5d..6df195de51a8 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -159,7 +159,7 @@ EditPaM ImpEditEngine::ReadXML( SvStream& rInput, EditSelection aSel )
 
 EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel )
 {
-#if defined (EDITDEBUG) && !defined( UNX )
+#if (OSL_DEBUG_LEVEL > 2) && !defined( UNX )
     SvFileStream aRTFOut( String( RTL_CONSTASCII_USTRINGPARAM ( "d:\\rtf_in.rtf" ) ), STREAM_WRITE );
     aRTFOut << rInput;
     aRTFOut.Close();
@@ -690,7 +690,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
     rOutput << "}}";    // 1xparentheses paragraphs, 1xparentheses RTF document
     rOutput.Flush();
 
-#if defined (EDITDEBUG) && !defined( UNX )
+#if (OSL_DEBUG_LEVEL > 2) && !defined( UNX )
     {
         SvFileStream aStream( String( RTL_CONSTASCII_USTRINGPARAM ( "d:\\rtf_out.rtf" ) ), STREAM_WRITE|STREAM_TRUNC );
         sal_uLong nP = rOutput.Tell();
diff --git a/editeng/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk
index 6a623d02c58d..838ad50246da 100644
--- a/editeng/source/editeng/makefile.mk
+++ b/editeng/source/editeng/makefile.mk
@@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- General ----------------------------------------------------------
 
-.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != ""
-CDEFS+=-DEDITDEBUG
-.ENDIF
-
 SLOFILES =	\
             $(SLO)$/textconv.obj \
             $(SLO)$/editattr.obj \