EDITENG : Remove usage of DBG_CTOR and DBG_DTOR.

Valgrind is capable of detecting such bugs. No need for extra macros.

Change-Id: Ifc04e2ec9d27c706868569a3bcb8fbfae0e84c69
Reviewed-on: https://gerrit.libreoffice.org/7524
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

20 files changed, 0 insertions, 872 deletions

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 3b44e946419a..75dce259e031 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -76,7 +76,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::accessibility;
 
-
 //------------------------------------------------------------------------
 //
 // AccessibleEditableTextPara implementation
@@ -102,9 +101,6 @@ namespace accessibility
         return &aPropSet;
     }
 
-
-    DBG_NAME( AccessibleEditableTextPara )
-
     // #i27138# - add parameter <_pParaManager>
     AccessibleEditableTextPara::AccessibleEditableTextPara(
                                 const uno::Reference< XAccessible >& rParent,
@@ -125,7 +121,6 @@ namespace accessibility
           mpParaManager( _pParaManager )
     {
 #ifdef DBG_UTIL
-        DBG_CTOR( AccessibleEditableTextPara, NULL );
         OSL_TRACE( "AccessibleEditableTextPara received ID: %d", mnNotifierClientId );
 #endif
 
@@ -150,8 +145,6 @@ namespace accessibility
 
     AccessibleEditableTextPara::~AccessibleEditableTextPara()
     {
-        DBG_DTOR( AccessibleEditableTextPara, NULL );
-
         // sign off from event notifier
         if( getNotifierClientId() != -1 )
         {
@@ -170,15 +163,11 @@ namespace accessibility
 
     OUString AccessibleEditableTextPara::implGetText()
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return GetTextRange( 0, GetTextLen() );
     }
 
     ::com::sun::star::lang::Locale AccessibleEditableTextPara::implGetLocale()
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
                    "AccessibleEditableTextPara::getLocale: paragraph index value overflow");
 
@@ -188,8 +177,6 @@ namespace accessibility
 
     void AccessibleEditableTextPara::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         sal_uInt16 nStart, nEnd;
 
         if( GetSelection( nStart, nEnd ) )
@@ -207,7 +194,6 @@ namespace accessibility
 
     void AccessibleEditableTextPara::implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 /*nIndex*/ )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
         DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" );
 
         rBoundary.startPos = 0;
@@ -219,8 +205,6 @@ namespace accessibility
 
     void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SvxTextForwarder&   rCacheTF = GetTextForwarder();
         const sal_Int32     nParaIndex = GetParagraphIndex();
 
@@ -267,29 +251,21 @@ namespace accessibility
 
     int AccessibleEditableTextPara::getNotifierClientId() const
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return mnNotifierClientId;
     }
 
     void AccessibleEditableTextPara::SetIndexInParent( sal_Int32 nIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         mnIndexInParent = nIndex;
     }
 
     sal_Int32 AccessibleEditableTextPara::GetIndexInParent() const
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return mnIndexInParent;
     }
 
     void AccessibleEditableTextPara::SetParagraphIndex( sal_Int32 nIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         sal_Int32 nOldIndex = mnParagraphIndex;
 
         mnParagraphIndex = nIndex;
@@ -325,15 +301,11 @@ namespace accessibility
 
     sal_Int32 AccessibleEditableTextPara::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return mnParagraphIndex;
     }
 
     void AccessibleEditableTextPara::Dispose()
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         int nClientId( getNotifierClientId() );
 
         // #108212# drop all references before notifying dispose
@@ -362,8 +334,6 @@ namespace accessibility
 
     void AccessibleEditableTextPara::SetEditSource( SvxEditSourceAdapter* pEditSource )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         WeakBullet::HardRefType aChild( maImageBullet.get() );
         if( aChild.is() )
             aChild->SetEditSource(pEditSource);
@@ -391,8 +361,6 @@ namespace accessibility
 
     ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nStartEEIndex, sal_Int32 nEndEEIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         // check overflow
         DBG_ASSERT(nStartEEIndex >= 0 && nStartEEIndex <= USHRT_MAX &&
                    nEndEEIndex >= 0 && nEndEEIndex <= USHRT_MAX &&
@@ -406,22 +374,16 @@ namespace accessibility
 
     ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nEEIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return MakeSelection( nEEIndex, nEEIndex+1 );
     }
 
     ESelection AccessibleEditableTextPara::MakeCursor( sal_Int32 nEEIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return MakeSelection( nEEIndex, nEEIndex );
     }
 
     void AccessibleEditableTextPara::CheckIndex( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         if( nIndex < 0 || nIndex >= getCharacterCount() )
             throw lang::IndexOutOfBoundsException("AccessibleEditableTextPara: character index out of bounds",
                                                   uno::Reference< uno::XInterface >
@@ -430,8 +392,6 @@ namespace accessibility
 
     void AccessibleEditableTextPara::CheckPosition( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         if( nIndex < 0 || nIndex > getCharacterCount() )
             throw lang::IndexOutOfBoundsException("AccessibleEditableTextPara: character position out of bounds",
                                                   uno::Reference< uno::XInterface >
@@ -440,16 +400,12 @@ namespace accessibility
 
     void AccessibleEditableTextPara::CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         CheckPosition( nStart );
         CheckPosition( nEnd );
     }
 
     sal_Bool AccessibleEditableTextPara::GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         ESelection aSelection;
         sal_Int32 nPara = GetParagraphIndex();
         if( !GetEditViewForwarder().GetSelection( aSelection ) )
@@ -493,22 +449,16 @@ namespace accessibility
 
     OUString AccessibleEditableTextPara::GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return GetTextForwarder().GetText( MakeSelection(nStartIndex, nEndIndex) );
     }
 
     sal_uInt16 AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
     }
 
     SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         if( mpEditSource )
             return *mpEditSource;
         else
@@ -520,8 +470,6 @@ namespace accessibility
 
     SvxAccessibleTextAdapter& AccessibleEditableTextPara::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SvxEditSourceAdapter& rEditSource = GetEditSource();
         SvxAccessibleTextAdapter* pTextForwarder = rEditSource.GetTextForwarderAdapter();
 
@@ -542,8 +490,6 @@ namespace accessibility
 
     SvxViewForwarder& AccessibleEditableTextPara::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SvxEditSource& rEditSource = GetEditSource();
         SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
 
@@ -566,8 +512,6 @@ namespace accessibility
 
     SvxAccessibleTextEditViewAdapter& AccessibleEditableTextPara::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SvxEditSourceAdapter& rEditSource = GetEditSource();
         SvxAccessibleTextEditViewAdapter* pTextEditViewForwarder = rEditSource.GetEditViewForwarderAdapter( bCreate );
 
@@ -604,8 +548,6 @@ namespace accessibility
 
     sal_Bool AccessibleEditableTextPara::HaveEditView() const
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SvxEditSource& rEditSource = GetEditSource();
         SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder();
 
@@ -620,8 +562,6 @@ namespace accessibility
 
     sal_Bool AccessibleEditableTextPara::HaveChildren()
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
                    "AccessibleEditableTextPara::HaveChildren: paragraph index value overflow");
 
@@ -637,15 +577,11 @@ namespace accessibility
 
     const Point& AccessibleEditableTextPara::GetEEOffset() const
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return maEEOffset;
     }
 
     void AccessibleEditableTextPara::SetEEOffset( const Point& rOffset )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         WeakBullet::HardRefType aChild( maImageBullet.get() );
         if( aChild.is() )
             aChild->SetEEOffset(rOffset);
@@ -655,8 +591,6 @@ namespace accessibility
 
     void AccessibleEditableTextPara::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue) const
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleEditableTextPara* > (this)->getAccessibleContext() );
 
         AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
@@ -673,22 +607,16 @@ namespace accessibility
 
     void AccessibleEditableTextPara::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         FireEvent( nEventId, rNewValue );
     }
 
     void AccessibleEditableTextPara::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         FireEvent( nEventId, uno::Any(), rOldValue );
     }
 
     void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
             !pStateSet->contains(nStateId) )
@@ -700,8 +628,6 @@ namespace accessibility
 
     void AccessibleEditableTextPara::UnSetState( const sal_Int16 nStateId )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
             pStateSet->contains(nStateId) )
@@ -726,8 +652,6 @@ namespace accessibility
 
     sal_Bool AccessibleEditableTextPara::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex )
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
                    "AccessibleEditableTextPara::GetAttributeRun: index value overflow");
 
@@ -742,8 +666,6 @@ namespace accessibility
 
     uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         uno::Any aRet;
 
         // must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
@@ -773,8 +695,6 @@ namespace accessibility
     // XAccessible
     uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         // We implement the XAccessibleContext interface in the same object
         return uno::Reference< XAccessibleContext > ( this );
     }
@@ -782,8 +702,6 @@ namespace accessibility
     // XAccessibleContext
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         return HaveChildren() ? 1 : 0;
@@ -791,8 +709,6 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         if( !HaveChildren() )
@@ -832,7 +748,6 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
 #ifdef DBG_UTIL
         if( !mxParent.is() )
@@ -844,21 +759,16 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return mnIndexInParent;
     }
 
     sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return AccessibleRole::PARAGRAPH;
     }
 
     OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
         SolarMutexGuard aGuard;
 
         // append first 40 characters from text, or first line, if shorter
@@ -903,8 +813,6 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         // throws if defunc
@@ -918,8 +826,6 @@ namespace accessibility
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         // #i27138# - provide relations CONTENT_FLOWS_FROM
         // and CONTENT_FLOWS_TO
         if ( mpParaManager )
@@ -1096,8 +1002,6 @@ namespace accessibility
 
     uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         // Create a copy of the state set and return it.
@@ -1120,8 +1024,6 @@ namespace accessibility
 
     lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         return implGetLocale();
@@ -1129,16 +1031,12 @@ namespace accessibility
 
     void SAL_CALL AccessibleEditableTextPara::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
     void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
     }
@@ -1146,8 +1044,6 @@ namespace accessibility
     // XAccessibleComponent
     sal_Bool SAL_CALL AccessibleEditableTextPara::containsPoint( const awt::Point& aTmpPoint ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
@@ -1162,8 +1058,6 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         if( HaveChildren() )
@@ -1197,8 +1091,6 @@ namespace accessibility
 
     awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
@@ -1223,8 +1115,6 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleEditableTextPara::getLocation(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         awt::Rectangle aRect = getBounds();
@@ -1234,8 +1124,6 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         // relate us to parent
@@ -1280,8 +1168,6 @@ namespace accessibility
 
     awt::Size SAL_CALL AccessibleEditableTextPara::getSize(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         awt::Rectangle aRect = getBounds();
@@ -1291,16 +1177,12 @@ namespace accessibility
 
     void SAL_CALL AccessibleEditableTextPara::grabFocus(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         // set cursor to this paragraph
         setSelection(0,0);
     }
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         // #104444# Added to XAccessibleComponent interface
         svtools::ColorConfig aColorConfig;
         sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
@@ -1309,8 +1191,6 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         // #104444# Added to XAccessibleComponent interface
         Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
 
@@ -1323,8 +1203,6 @@ namespace accessibility
     // XAccessibleText
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         if( !HaveEditView() )
@@ -1353,15 +1231,11 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         return setSelection(nIndex, nIndex);
     }
 
     sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1372,7 +1246,6 @@ namespace accessibility
 
     uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& rRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
         SolarMutexGuard aGuard;
 
         //Skip the bullet range to ingnore the bullet text
@@ -1478,8 +1351,6 @@ namespace accessibility
 
     awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1513,8 +1384,6 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1525,8 +1394,6 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         sal_Int32 nPara;
@@ -1573,8 +1440,6 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleEditableTextPara::getSelectedText() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1588,8 +1453,6 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1603,8 +1466,6 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1618,8 +1479,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1640,8 +1499,6 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleEditableTextPara::getText() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1652,8 +1509,6 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1934,8 +1789,6 @@ namespace accessibility
 
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -2051,8 +1904,6 @@ namespace accessibility
 
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -2218,8 +2069,6 @@ namespace accessibility
 
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -2346,8 +2195,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
         SolarMutexGuard aGuard;
 
         try
@@ -2392,7 +2239,6 @@ namespace accessibility
     // XAccessibleEditableText
     sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2430,7 +2276,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2466,7 +2311,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2508,7 +2352,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const OUString& sText, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2549,7 +2392,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2593,7 +2435,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2653,7 +2494,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const OUString& sText ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2665,7 +2505,6 @@ namespace accessibility
             const uno::Sequence< OUString >& rRequestedAttributes )
         throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
         SolarMutexGuard aGuard;
 
         #if OSL_DEBUG_LEVEL > 0
@@ -2763,7 +2602,6 @@ namespace accessibility
             const uno::Sequence< OUString >& rRequestedAttributes )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -2930,7 +2768,6 @@ namespace accessibility
     // XAccessibleMultiLineText
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getLineNumberAtIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         sal_Int32 nRes = -1;
         sal_Int32 nPara = GetParagraphIndex();
@@ -2952,7 +2789,6 @@ namespace accessibility
     // XAccessibleMultiLineText
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         ::com::sun::star::accessibility::TextSegment aResult;
         sal_Int32 nPara = GetParagraphIndex();
@@ -2989,7 +2825,6 @@ namespace accessibility
     // XAccessibleMultiLineText
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         ::com::sun::star::accessibility::TextSegment aResult;
         try
@@ -3006,7 +2841,6 @@ namespace accessibility
     // XAccessibleMultiLineText
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getNumberOfLineWithCaret(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         sal_Int32 nRes = -1;
         try
@@ -3024,21 +2858,18 @@ namespace accessibility
     // XServiceInfo
     OUString SAL_CALL AccessibleEditableTextPara::getImplementationName (void) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         return OUString("AccessibleEditableTextPara");
     }
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const OUString& sServiceName) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         return cppu::supportsService(this, sServiceName);
     }
 
     uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames (void) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         const OUString sServiceName( getServiceName() );
         return uno::Sequence< OUString > (&sServiceName, 1);
@@ -3047,7 +2878,6 @@ namespace accessibility
     // XServiceName
     OUString SAL_CALL AccessibleEditableTextPara::getServiceName (void) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         // #105185# Using correct service now
         return OUString("com.sun.star.text.AccessibleParagraphView");
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 51b464446bc0..40f3ed8a6946 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star::accessibility;
 
 namespace accessibility
 {
-    DBG_NAME( AccessibleImageBullet )
 
     AccessibleImageBullet::AccessibleImageBullet ( const uno::Reference< XAccessible >& rParent ) :
         mnParagraphIndex( 0 ),
@@ -64,7 +63,6 @@ namespace accessibility
         mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
     {
 #ifdef DBG_UTIL
-        DBG_CTOR( AccessibleImageBullet, NULL );
         OSL_TRACE( "Received ID: %d", mnNotifierClientId );
 #endif
 
@@ -85,7 +83,6 @@ namespace accessibility
 
     AccessibleImageBullet::~AccessibleImageBullet()
     {
-        DBG_DTOR( AccessibleImageBullet, NULL );
 
         // sign off from event notifier
         if( getNotifierClientId() != -1 )
@@ -103,14 +100,12 @@ namespace accessibility
 
     uno::Any SAL_CALL AccessibleImageBullet::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return AccessibleImageBulletInterfaceBase::queryInterface(rType);
     }
 
     uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         // We implement the XAccessibleContext interface in the same object
         return uno::Reference< XAccessibleContext > ( this );
@@ -118,14 +113,12 @@ namespace accessibility
 
     sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleChildCount() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return 0;
     }
 
     uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
         (void)i;
 
         throw lang::IndexOutOfBoundsException("No children available",
@@ -135,28 +128,24 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleParent() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return mxParent;
     }
 
     sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleIndexInParent() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return mnIndexInParent;
     }
 
     sal_Int16 SAL_CALL  AccessibleImageBullet::getAccessibleRole() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return AccessibleRole::GRAPHIC;
     }
 
     OUString SAL_CALL  AccessibleImageBullet::getAccessibleDescription() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -166,7 +155,6 @@ namespace accessibility
 
     OUString SAL_CALL  AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -176,7 +164,6 @@ namespace accessibility
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         // no relations, therefore empty
         return uno::Reference< XAccessibleRelationSet >();
@@ -184,7 +171,6 @@ namespace accessibility
 
     uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet() throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -199,7 +185,6 @@ namespace accessibility
 
     lang::Locale SAL_CALL AccessibleImageBullet::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -212,7 +197,6 @@ namespace accessibility
 
     void SAL_CALL AccessibleImageBullet::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
@@ -220,7 +204,6 @@ namespace accessibility
 
     void SAL_CALL AccessibleImageBullet::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
@@ -228,7 +211,6 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleImageBullet::containsPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -244,7 +226,6 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         // as we have no children, empty reference
         return uno::Reference< XAccessible >();
@@ -252,7 +233,6 @@ namespace accessibility
 
     awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -291,7 +271,6 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleImageBullet::getLocation(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -302,7 +281,6 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -329,7 +307,6 @@ namespace accessibility
 
     awt::Size SAL_CALL AccessibleImageBullet::getSize(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SolarMutexGuard aGuard;
 
@@ -340,7 +317,6 @@ namespace accessibility
 
     void SAL_CALL AccessibleImageBullet::grabFocus(  ) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         throw uno::RuntimeException("Not focusable",
                                     uno::Reference< uno::XInterface >
@@ -349,7 +325,6 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleImageBullet::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         // #104444# Added to XAccessibleComponent interface
         svtools::ColorConfig aColorConfig;
@@ -359,7 +334,6 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleImageBullet::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         // #104444# Added to XAccessibleComponent interface
         Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
@@ -372,21 +346,18 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleImageBullet::getImplementationName (void) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return OUString("AccessibleImageBullet");
     }
 
     sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return cppu::supportsService(this, sServiceName);
     }
 
     uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames (void) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext");
         return uno::Sequence< OUString > (&sServiceName, 1);
@@ -394,28 +365,24 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleImageBullet::getServiceName (void) throw (uno::RuntimeException)
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return OUString("com.sun.star.accessibility.AccessibleContext");
     }
 
     void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex )
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         mnIndexInParent = nIndex;
     }
 
     void AccessibleImageBullet::SetEEOffset( const Point& rOffset )
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         maEEOffset = rOffset;
     }
 
     void AccessibleImageBullet::Dispose()
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         int nClientId( getNotifierClientId() );
 
@@ -443,7 +410,6 @@ namespace accessibility
 
     void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource )
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         mpEditSource = pEditSource;
 
@@ -461,7 +427,6 @@ namespace accessibility
 
     void AccessibleImageBullet::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleImageBullet* > (this)->getAccessibleContext() );
 
@@ -474,21 +439,18 @@ namespace accessibility
 
     void AccessibleImageBullet::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         FireEvent( nEventId, rNewValue );
     }
 
     void AccessibleImageBullet::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         FireEvent( nEventId, uno::Any(), rOldValue );
     }
 
     void AccessibleImageBullet::SetState( const sal_Int16 nStateId )
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
@@ -501,7 +463,6 @@ namespace accessibility
 
     void AccessibleImageBullet::UnSetState( const sal_Int16 nStateId )
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
@@ -514,14 +475,12 @@ namespace accessibility
 
     int AccessibleImageBullet::getNotifierClientId() const
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return mnNotifierClientId;
     }
 
     void AccessibleImageBullet::SetParagraphIndex( sal_Int32 nIndex )
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         uno::Any aOldDesc;
         uno::Any aOldName;
@@ -551,14 +510,12 @@ namespace accessibility
 
     sal_Int32 AccessibleImageBullet::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return mnParagraphIndex;
     }
 
     SvxEditSource& AccessibleImageBullet::GetEditSource() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         if( mpEditSource )
             return *mpEditSource;
@@ -571,7 +528,6 @@ namespace accessibility
 
     SvxTextForwarder& AccessibleImageBullet::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SvxEditSource& rEditSource = GetEditSource();
         SvxTextForwarder* pTextForwarder = rEditSource.GetTextForwarder();
@@ -593,7 +549,6 @@ namespace accessibility
 
     SvxViewForwarder& AccessibleImageBullet::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         SvxEditSource& rEditSource = GetEditSource();
         SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
@@ -617,7 +572,6 @@ namespace accessibility
 
     const Point& AccessibleImageBullet::GetEEOffset() const
     {
-        DBG_CHKTHIS( AccessibleImageBullet, NULL );
 
         return maEEOffset;
     }
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 890bc5480241..d7fa15827c6f 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -102,7 +102,6 @@ namespace accessibility
     //
     //------------------------------------------------------------------------
 
-    DBG_NAME( AccessibleStaticTextBase_Impl );
 
     /** AccessibleStaticTextBase_Impl
 
@@ -123,7 +122,6 @@ namespace accessibility
 
         SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException))
         {
-            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
             return maEditSource;
         }
@@ -133,13 +131,11 @@ namespace accessibility
 
         void SetEventSource( const uno::Reference< XAccessible >& rInterface )
         {
-            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
             mxThis = rInterface;
         }
         uno::Reference< XAccessible > GetEventSource() const
         {
-            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
             return mxThis;
         }
@@ -147,7 +143,6 @@ namespace accessibility
         void SetOffset( const Point& );
         Point GetOffset() const
         {
-            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
             ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset );
             return aPoint;
@@ -165,14 +160,12 @@ namespace accessibility
 
         EPosition                   Index2Internal( sal_Int32 nFlatIndex ) const
         {
-            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
             return ImpCalcInternal( nFlatIndex, false );
         }
 
         EPosition                   Range2Internal( sal_Int32 nFlatIndex ) const
         {
-            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
             return ImpCalcInternal( nFlatIndex, true );
         }
@@ -229,7 +222,6 @@ namespace accessibility
         maMutex(),
         maOffset(0,0)
     {
-        DBG_CTOR( AccessibleStaticTextBase_Impl, NULL );
 
         // TODO: this is still somewhat of a hack, all the more since
         // now the maTextParagraph has an empty parent reference set
@@ -237,13 +229,11 @@ namespace accessibility
 
     AccessibleStaticTextBase_Impl::~AccessibleStaticTextBase_Impl()
     {
-        DBG_DTOR( AccessibleStaticTextBase_Impl, NULL );
     }
 
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         maEditSource.SetEditSource( pEditSource );
         if( mpTextParagraph )
@@ -253,7 +243,6 @@ namespace accessibility
 
     void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint )
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         // guard against non-atomic access to maOffset data structure
         {
@@ -270,14 +259,12 @@ namespace accessibility
 
     void AccessibleStaticTextBase_Impl::UpdateChildren()
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         // currently no children
     }
 
     void AccessibleStaticTextBase_Impl::Dispose()
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         // we're the owner of the paragraph, so destroy it, too
         if( mpTextParagraph )
@@ -298,7 +285,6 @@ namespace accessibility
 
     AccessibleEditableTextPara& AccessibleStaticTextBase_Impl::GetParagraph( sal_Int32 nPara ) const
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         if( !mpTextParagraph )
             throw lang::DisposedException ("object has been already disposed", mxThis );
@@ -312,7 +298,6 @@ namespace accessibility
 
     sal_Int32 AccessibleStaticTextBase_Impl::GetParagraphCount() const
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         if( !mpTextParagraph )
             return 0;
@@ -357,7 +342,6 @@ namespace accessibility
 
     EPosition AccessibleStaticTextBase_Impl::ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         if( nFlatIndex < 0 )
             throw lang::IndexOutOfBoundsException("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds",
@@ -399,7 +383,6 @@ namespace accessibility
     sal_Bool AccessibleStaticTextBase_Impl::SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex,
                                                           sal_Int32 nEndPara, sal_Int32 nEndIndex )
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         if( !mpTextParagraph )
             return sal_False;
@@ -418,7 +401,6 @@ namespace accessibility
     sal_Bool AccessibleStaticTextBase_Impl::CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex,
                                                       sal_Int32 nEndPara, sal_Int32 nEndIndex )
     {
-        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
 
         if( !mpTextParagraph )
             return sal_False;
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index de847d6adc74..1014424c844d 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -46,7 +46,6 @@
 
 #include "editattr.hxx"
 
-DBG_NAME( EE_EditAttrib )
 
 // -------------------------------------------------------------------------
 // class EditCharAttrib
@@ -54,7 +53,6 @@ DBG_NAME( EE_EditAttrib )
 EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE ) :
     nStart(nS), nEnd(nE), bFeature(false), bEdge(false)
 {
-    DBG_CTOR( EE_EditAttrib, 0 );
     pItem = &rAttr;
 
     DBG_ASSERT( ( rAttr.Which() >= EE_ITEMS_START ) && ( rAttr.Which() <= EE_ITEMS_END ), "EditCharAttrib CTOR: Invalid id!" );
@@ -63,7 +61,6 @@ EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uIn
 
 EditCharAttrib::~EditCharAttrib()
 {
-    DBG_DTOR( EE_EditAttrib, 0 );
 }
 
 void EditCharAttrib::SetFont( SvxFont&, OutputDevice* )
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 2b0e40fe4c4f..7e0270362ca0 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -161,11 +161,6 @@ sal_Bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType )
 // Should later be moved to TOOLS/STRING (Current: 303)
 // for Grep: WS_TARGET
 
-DBG_NAME( EE_TextPortion );
-DBG_NAME( EE_EditLine );
-DBG_NAME( EE_ContentNode );
-DBG_NAME( EE_CharAttribList );
-DBG_NAME( EE_ParaPortion )
 
 const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
         { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE },         // EE_PARA_WRITINGDIR
@@ -532,7 +527,6 @@ void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLe
 
 ParaPortion::ParaPortion( ContentNode* pN )
 {
-    DBG_CTOR( EE_ParaPortion, 0 );
 
     pNode               = pN;
     bInvalid            = sal_True;
@@ -548,7 +542,6 @@ ParaPortion::ParaPortion( ContentNode* pN )
 
 ParaPortion::~ParaPortion()
 {
-    DBG_DTOR( EE_ParaPortion, 0 );
 }
 
 void ParaPortion::MarkInvalid( sal_uInt16 nStart, short nDiff )
@@ -948,7 +941,6 @@ EditLine::EditLine() :
     bHangingPunctuation(false),
     bInvalid(true)
 {
-    DBG_CTOR( EE_EditLine, 0 );
 
     nStart = nEnd = 0;
     nStartPortion = 0;  // to be able to tell the difference between a line
@@ -966,7 +958,6 @@ EditLine::EditLine( const EditLine& r ) :
     bHangingPunctuation(r.bHangingPunctuation),
     bInvalid(true)
 {
-    DBG_CTOR( EE_EditLine, 0 );
 
     nEnd = r.nEnd;
     nStart = r.nStart;
@@ -983,7 +974,6 @@ EditLine::EditLine( const EditLine& r ) :
 
 EditLine::~EditLine()
 {
-    DBG_DTOR( EE_EditLine, 0 );
 }
 
 EditLine::CharPosArrayType& EditLine::GetCharPosArray()
@@ -1298,18 +1288,15 @@ sal_Bool operator != ( const EditPaM& r1,  const EditPaM& r2  )
 
 ContentNode::ContentNode( SfxItemPool& rPool ) : aContentAttribs( rPool )
 {
-    DBG_CTOR( EE_ContentNode, 0 );
 }
 
 ContentNode::ContentNode( const OUString& rStr, const ContentAttribs& rContentAttribs ) :
     maString(rStr), aContentAttribs(rContentAttribs)
 {
-    DBG_CTOR( EE_ContentNode, 0 );
 }
 
 ContentNode::~ContentNode()
 {
-    DBG_DTOR( EE_ContentNode, 0 );
 }
 
 void ContentNode::ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNew, SfxItemPool& rItemPool )
@@ -2694,12 +2681,10 @@ CharAttribList::CharAttribList()
 , aDefFont()
 , bHasEmptyAttribs(false)
 {
-    DBG_CTOR( EE_CharAttribList, 0 );
 }
 
 CharAttribList::~CharAttribList()
 {
-    DBG_DTOR( EE_CharAttribList, 0 );
 }
 
 void CharAttribList::InsertAttrib( EditCharAttrib* pAttrib )
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index aebbd041a406..f7100ef033ca 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -40,7 +40,6 @@
 class ImpEditEngine;
 class SvxTabStop;
 
-DBG_NAMEEX( EE_TextPortion )
 
 #define CHARPOSGROW     16
 #define DEFTAB          720
@@ -399,7 +398,6 @@ private:
                 , nRightToLeft( sal_False )
                 , nExtraValue( 0 )
                 {
-                    DBG_CTOR( EE_TextPortion, 0 );
                 }
 
 public:
@@ -411,7 +409,6 @@ public:
                 , nRightToLeft( sal_False )
                 , nExtraValue( 0 )
                 {
-                    DBG_CTOR( EE_TextPortion, 0 );
                 }
 
                 TextPortion( const TextPortion& r )
@@ -422,10 +419,8 @@ public:
                 , nRightToLeft( r.nRightToLeft )
                 , nExtraValue( r.nExtraValue )
                 {
-                    DBG_CTOR( EE_TextPortion, 0 );
                 }
 
-                ~TextPortion()              {   DBG_DTOR( EE_TextPortion, 0 ); delete pExtraInfos; }
 
     sal_uInt16      GetLen() const              { return nLen; }
     void        SetLen( sal_uInt16 nL )         { nLen = nL; }
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index c9b79703a0ef..649a725603f4 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -86,8 +86,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
 
-DBG_NAME( EditEngine )
-DBG_NAMEEX( EditView )
 
 #if (OSL_DEBUG_LEVEL > 1) || defined ( DBG_UTIL )
 static sal_Bool bDebugPaint = sal_False;
@@ -100,49 +98,41 @@ static SfxItemPool* pGlobalPool=0;
 // ----------------------------------------------------------------------
 EditEngine::EditEngine( SfxItemPool* pItemPool )
 {
-    DBG_CTOR( EditEngine, 0 );
     pImpEditEngine = new ImpEditEngine( this, pItemPool );
 }
 
 EditEngine::~EditEngine()
 {
-    DBG_DTOR( EditEngine, 0 );
     delete pImpEditEngine;
 }
 
 void EditEngine::EnableUndo( sal_Bool bEnable )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EnableUndo( bEnable );
 }
 
 sal_Bool EditEngine::IsUndoEnabled()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsUndoEnabled();
 }
 
 sal_Bool EditEngine::IsInUndo()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsInUndo();
 }
 
 ::svl::IUndoManager& EditEngine::GetUndoManager()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetUndoManager();
 }
 
 ::svl::IUndoManager* EditEngine::SetUndoManager(::svl::IUndoManager* pNew)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->SetUndoManager(pNew);
 }
 
 void EditEngine::UndoActionStart( sal_uInt16 nId )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     DBG_ASSERT( !pImpEditEngine->IsInUndo(), "Calling UndoActionStart in Undomode!" );
     if ( !pImpEditEngine->IsInUndo() )
         pImpEditEngine->UndoActionStart( nId );
@@ -155,7 +145,6 @@ void EditEngine::UndoActionStart(sal_uInt16 nId, const ESelection& rSel)
 
 void EditEngine::UndoActionEnd( sal_uInt16 nId )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     DBG_ASSERT( !pImpEditEngine->IsInUndo(), "Calling UndoActionEnd in Undomode!" );
     if ( !pImpEditEngine->IsInUndo() )
         pImpEditEngine->UndoActionEnd( nId );
@@ -168,79 +157,66 @@ bool EditEngine::HasTriedMergeOnLastAddUndo() const
 
 void EditEngine::SetRefDevice( OutputDevice* pRefDev )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetRefDevice( pRefDev );
 }
 
 OutputDevice* EditEngine::GetRefDevice() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetRefDevice();
 }
 
 void EditEngine::SetRefMapMode( const MapMode& rMapMode )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetRefMapMode( rMapMode );
 }
 
 MapMode EditEngine::GetRefMapMode()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetRefMapMode();
 }
 
 void EditEngine::SetBackgroundColor( const Color& rColor )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetBackgroundColor( rColor );
 }
 
 Color EditEngine::GetBackgroundColor() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetBackgroundColor();
 }
 
 Color EditEngine::GetAutoColor() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetAutoColor();
 }
 
 void EditEngine::EnableAutoColor( sal_Bool b )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EnableAutoColor( b );
 }
 
 void EditEngine::ForceAutoColor( sal_Bool b )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->ForceAutoColor( b );
 }
 
 sal_Bool EditEngine::IsForceAutoColor() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsForceAutoColor();
 }
 
 const SfxItemSet& EditEngine::GetEmptyItemSet()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetEmptyItemSet();
 }
 
 void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     Draw( pOutDev, rOutRect, Point( 0, 0 ) );
 }
 
 void EditEngine::Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     // Create with 2 points, as with positive points it will end up with
     // LONGMAX as Size, Bottom and Right in the range > LONGMAX.
     Rectangle aBigRect( -0x3FFFFFFF, -0x3FFFFFFF, 0x3FFFFFFF, 0x3FFFFFFF );
@@ -264,7 +240,6 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
 
 void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, sal_Bool bClip )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
 #if defined( DBG_UTIL ) || (OSL_DEBUG_LEVEL > 1)
     if ( bDebugPaint )
@@ -335,8 +310,6 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
 
 void EditEngine::InsertView(EditView* pEditView, size_t nIndex)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_CHKOBJ( pEditView, EditView, 0 );
 
     if ( nIndex > pImpEditEngine->GetEditViews().size() )
         nIndex = pImpEditEngine->GetEditViews().size();
@@ -355,8 +328,6 @@ void EditEngine::InsertView(EditView* pEditView, size_t nIndex)
 
 EditView* EditEngine::RemoveView( EditView* pView )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_CHKOBJ( pView, EditView, 0 );
 
     pView->HideCursor();
     EditView* pRemoved = NULL;
@@ -381,7 +352,6 @@ EditView* EditEngine::RemoveView( EditView* pView )
 
 EditView* EditEngine::RemoveView(size_t nIndex)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     ImpEditEngine::ViewsType& rViews = pImpEditEngine->GetEditViews();
     if (nIndex >= rViews.size())
         return NULL;
@@ -394,13 +364,11 @@ EditView* EditEngine::RemoveView(size_t nIndex)
 
 EditView* EditEngine::GetView(size_t nIndex) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetEditViews()[nIndex];
 }
 
 size_t EditEngine::GetViewCount() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetEditViews().size();
 }
 
@@ -412,7 +380,6 @@ sal_Bool EditEngine::HasView( EditView* pView ) const
 
 EditView* EditEngine::GetActiveView() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetActiveView();
 }
 
@@ -423,7 +390,6 @@ void EditEngine::SetActiveView(EditView* pView)
 
 void EditEngine::SetDefTab( sal_uInt16 nDefTab )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->GetEditDoc().SetDefTab( nDefTab );
     if ( pImpEditEngine->IsFormatted() )
     {
@@ -434,7 +400,6 @@ void EditEngine::SetDefTab( sal_uInt16 nDefTab )
 
 void EditEngine::SetPaperSize( const Size& rNewSize )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     Size aOldSize( pImpEditEngine->GetPaperSize() );
     pImpEditEngine->SetValidPaperSize( rNewSize );
@@ -446,7 +411,6 @@ void EditEngine::SetPaperSize( const Size& rNewSize )
         for (size_t nView = 0; nView < pImpEditEngine->aEditViews.size(); ++nView)
         {
             EditView* pView = pImpEditEngine->aEditViews[nView];
-            DBG_CHKOBJ( pView, EditView, 0 );
             if ( bAutoPageSize )
                 pView->pImpEditView->RecalcOutputArea();
             else if ( pView->pImpEditView->DoAutoSize() )
@@ -473,43 +437,36 @@ void EditEngine::SetPaperSize( const Size& rNewSize )
 
 const Size& EditEngine::GetPaperSize() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetPaperSize();
 }
 
 void EditEngine::SetVertical( bool bVertical )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetVertical( bVertical );
 }
 
 bool EditEngine::IsVertical() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsVertical();
 }
 
 void EditEngine::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
 }
 
 void EditEngine::SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetDefaultHorizontalTextDirection( eHTextDir );
 }
 
 EEHorizontalTextDirection EditEngine::GetDefaultHorizontalTextDirection() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetDefaultHorizontalTextDirection();
 }
 
 sal_uInt16 EditEngine::GetScriptType( const ESelection& rSelection ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->CreateSel( rSelection ) );
     return pImpEditEngine->GetItemScriptType( aSel );
 }
@@ -521,7 +478,6 @@ LanguageType EditEngine::GetLanguage(const EditPaM& rPaM) const
 
 LanguageType EditEngine::GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
     DBG_ASSERT( pNode, "GetLanguage - nPara is invalid!" );
     return pNode ? pImpEditEngine->GetLanguage( EditPaM( pNode, nPos ) ) : LANGUAGE_DONTKNOW;
@@ -530,7 +486,6 @@ LanguageType EditEngine::GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const
 
 void EditEngine::TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditEngine->TransliterateText( pImpEditEngine->CreateSel( rSelection ), nTransliterationMode );
 }
 
@@ -541,31 +496,26 @@ EditSelection EditEngine::TransliterateText(const EditSelection& rSelection, sal
 
 void EditEngine::SetAsianCompressionMode( sal_uInt16 n )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditEngine->SetAsianCompressionMode( n );
 }
 
 void EditEngine::SetKernAsianPunctuation( sal_Bool b )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditEngine->SetKernAsianPunctuation( b );
 }
 
 void EditEngine::SetAddExtLeading( sal_Bool b )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetAddExtLeading( b );
 }
 
 void EditEngine::SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     SetPolygon( rPolyPolygon, 0L );
 }
 
 void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     sal_Bool bSimple(sal_False);
 
     if(pLinePolyPolygon && 1L == rPolyPolygon.count())
@@ -584,62 +534,52 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b
 
 void EditEngine::ClearPolygon()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetTextRanger( 0 );
 }
 
 const Size& EditEngine::GetMinAutoPaperSize() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetMinAutoPaperSize();
 }
 
 void EditEngine::SetMinAutoPaperSize( const Size& rSz )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetMinAutoPaperSize( rSz );
 }
 
 const Size& EditEngine::GetMaxAutoPaperSize() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetMaxAutoPaperSize();
 }
 
 void EditEngine::SetMaxAutoPaperSize( const Size& rSz )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetMaxAutoPaperSize( rSz );
 }
 
 OUString EditEngine::GetText( LineEnd eEnd ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetEditDoc().GetText( eEnd );
 }
 
 OUString EditEngine::GetText( const ESelection& rESelection, const LineEnd eEnd ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->CreateSel( rESelection ) );
     return pImpEditEngine->GetSelected( aSel, eEnd );
 }
 
 sal_uInt32 EditEngine::GetTextLen() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetEditDoc().GetTextLen();
 }
 
 sal_Int32 EditEngine::GetParagraphCount() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->aEditDoc.Count();
 }
 
 sal_uInt16 EditEngine::GetLineCount( sal_Int32 nParagraph ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
     return pImpEditEngine->GetLineCount( nParagraph );
@@ -647,7 +587,6 @@ sal_uInt16 EditEngine::GetLineCount( sal_Int32 nParagraph ) const
 
 sal_uInt16 EditEngine::GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
     return pImpEditEngine->GetLineLen( nParagraph, nLine );
@@ -655,7 +594,6 @@ sal_uInt16 EditEngine::GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) cons
 
 void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
     return pImpEditEngine->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
@@ -663,7 +601,6 @@ void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16
 
 sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
     return pImpEditEngine->GetLineNumberAtIndex( nPara, nIndex );
@@ -671,7 +608,6 @@ sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex
 
 sal_uInt32 EditEngine::GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     // If someone calls GetLineHeight() with an empty Engine.
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
@@ -680,7 +616,6 @@ sal_uInt32 EditEngine::GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine )
 
 sal_uInt32 EditEngine::GetTextHeight( sal_Int32 nParagraph ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
@@ -1021,8 +956,6 @@ void EditEngine::SetInSelectionMode(bool b)
 
 sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_CHKOBJ( pEditView, EditView, 0 );
     DBG_ASSERT( pEditView, "no View - no cookie !" );
 
     sal_Bool bDone = sal_True;
@@ -1480,7 +1413,6 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
 
 sal_uInt32 EditEngine::GetTextHeight() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
@@ -1491,7 +1423,6 @@ sal_uInt32 EditEngine::GetTextHeight() const
 
 sal_uInt32 EditEngine::GetTextHeightNTP() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
@@ -1504,7 +1435,6 @@ sal_uInt32 EditEngine::GetTextHeightNTP() const
 
 sal_uInt32 EditEngine::CalcTextWidth()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
@@ -1515,7 +1445,6 @@ sal_uInt32 EditEngine::CalcTextWidth()
 
 void EditEngine::SetUpdateMode( sal_Bool bUpdate )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetUpdateMode( bUpdate );
     if ( pImpEditEngine->pActiveView )
         pImpEditEngine->pActiveView->ShowCursor( sal_False, sal_False );
@@ -1523,19 +1452,16 @@ void EditEngine::SetUpdateMode( sal_Bool bUpdate )
 
 sal_Bool EditEngine::GetUpdateMode() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetUpdateMode();
 }
 
 void EditEngine::Clear()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->Clear();
 }
 
 void EditEngine::SetText( const OUString& rText )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetText( rText );
     if ( !rText.isEmpty() )
         pImpEditEngine->FormatAndUpdate();
@@ -1543,7 +1469,6 @@ void EditEngine::SetText( const OUString& rText )
 
 sal_uLong EditEngine::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
     pImpEditEngine->EnableUndo( sal_False );
     pImpEditEngine->SetText( OUString() );
@@ -1555,7 +1480,6 @@ sal_uLong EditEngine::Read( SvStream& rInput, const OUString& rBaseURL, EETextFo
 
 sal_uLong EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     EditPaM aStartPaM( pImpEditEngine->GetEditDoc().GetStartPaM() );
     EditPaM aEndPaM( pImpEditEngine->GetEditDoc().GetEndPaM() );
     pImpEditEngine->Write( rOutput, eFormat, EditSelection( aStartPaM, aEndPaM ) );
@@ -1564,20 +1488,17 @@ sal_uLong EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
 
 EditTextObject* EditEngine::CreateTextObject()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->CreateTextObject();
 }
 
 EditTextObject* EditEngine::CreateTextObject( const ESelection& rESelection )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->CreateSel( rESelection ) );
     return pImpEditEngine->CreateTextObject( aSel );
 }
 
 void EditEngine::SetText( const EditTextObject& rTextObject )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EnterBlockNotifications();
     pImpEditEngine->SetText( rTextObject );
     pImpEditEngine->FormatAndUpdate();
@@ -1586,74 +1507,62 @@ void EditEngine::SetText( const EditTextObject& rTextObject )
 
 void EditEngine::ShowParagraph( sal_Int32 nParagraph, sal_Bool bShow )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->ShowParagraph( nParagraph, bShow );
 }
 
 void EditEngine::SetNotifyHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetNotifyHdl( rLink );
 }
 
 Link EditEngine::GetNotifyHdl() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetNotifyHdl();
 }
 
 void EditEngine::SetStatusEventHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetStatusEventHdl( rLink );
 }
 
 Link EditEngine::GetStatusEventHdl() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetStatusEventHdl();
 }
 
 void EditEngine::SetImportHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->aImportHdl = rLink;
 }
 
 Link EditEngine::GetImportHdl() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->aImportHdl;
 }
 
 void EditEngine::SetBeginMovingParagraphsHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->aBeginMovingParagraphsHdl = rLink;
 }
 
 void EditEngine::SetEndMovingParagraphsHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->aEndMovingParagraphsHdl = rLink;
 }
 
 void EditEngine::SetBeginPasteOrDropHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     pImpEditEngine->aBeginPasteOrDropHdl = rLink;
 }
 
 void EditEngine::SetEndPasteOrDropHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->aEndPasteOrDropHdl = rLink;
 }
 
 EditTextObject* EditEngine::CreateTextObject( sal_Int32 nPara, sal_Int32 nParas )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     DBG_ASSERT( 0 <= nPara && nPara < pImpEditEngine->GetEditDoc().Count(), "CreateTextObject: Startpara out of Range" );
     DBG_ASSERT( nParas <= pImpEditEngine->GetEditDoc().Count() - nPara, "CreateTextObject: Endpara out of Range" );
 
@@ -1674,7 +1583,6 @@ EditTextObject* EditEngine::CreateTextObject( sal_Int32 nPara, sal_Int32 nParas
 
 void EditEngine::RemoveParagraph( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     DBG_ASSERT( pImpEditEngine->GetEditDoc().Count() > 1, "The first paragraph should not be deleted!" );
     if( pImpEditEngine->GetEditDoc().Count() <= 1 )
         return;
@@ -1694,7 +1602,6 @@ void EditEngine::RemoveParagraph( sal_Int32 nPara )
 
 sal_uInt16 EditEngine::GetTextLen( sal_Int32 nPara ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
     DBG_ASSERT( pNode, "Paragraph not found: GetTextLen" );
     if ( pNode )
@@ -1704,7 +1611,6 @@ sal_uInt16 EditEngine::GetTextLen( sal_Int32 nPara ) const
 
 OUString EditEngine::GetText( sal_Int32 nPara ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     OUString aStr;
     if ( 0 <= nPara && nPara < pImpEditEngine->GetEditDoc().Count() )
         aStr = pImpEditEngine->GetEditDoc().GetParaAsString( nPara );
@@ -1713,45 +1619,38 @@ OUString EditEngine::GetText( sal_Int32 nPara ) const
 
 void EditEngine::SetModifyHdl( const Link& rLink )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetModifyHdl( rLink );
 }
 
 Link EditEngine::GetModifyHdl() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetModifyHdl();
 }
 
 
 void EditEngine::ClearModifyFlag()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetModifyFlag( sal_False );
 }
 
 void EditEngine::SetModified()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetModifyFlag( sal_True );
 }
 
 sal_Bool EditEngine::IsModified() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsModified();
 }
 
 sal_Bool EditEngine::IsInSelectionMode() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return ( pImpEditEngine->IsInSelectionMode() ||
                 pImpEditEngine->GetSelEngine().IsInSelection() );
 }
 
 void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( nPara > GetParagraphCount() )
     {
         DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" );
@@ -1774,7 +1673,6 @@ void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj
 
 void EditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( nPara > GetParagraphCount() )
     {
         DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" );
@@ -1793,7 +1691,6 @@ void EditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt)
 
 void EditEngine::SetText(sal_Int32 nPara, const OUString& rTxt)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     EditSelection* pSel = pImpEditEngine->SelectParagraph( nPara );
     if ( pSel )
     {
@@ -1807,38 +1704,32 @@ void EditEngine::SetText(sal_Int32 nPara, const OUString& rTxt)
 
 void EditEngine::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetParaAttribs( nPara, rSet );
     pImpEditEngine->FormatAndUpdate();
 }
 
 const SfxItemSet& EditEngine::GetParaAttribs( sal_Int32 nPara ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetParaAttribs( nPara );
 }
 
 sal_Bool EditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->HasParaAttrib( nPara, nWhich );
 }
 
 const SfxPoolItem& EditEngine::GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetParaAttrib( nPara, nWhich );
 }
 
 void EditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->GetCharAttribs( nPara, rLst );
 }
 
 SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->
         ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
     return pImpEditEngine->GetAttribs( aSel, bOnlyHardAttrib );
@@ -1846,13 +1737,11 @@ SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAtt
 
 SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetAttribs( nPara, nStart, nEnd, nFlags );
 }
 
 void EditEngine::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     pImpEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
     EditSelection aSel( pImpEditEngine->ConvertSelection( rSelection.nStartPara, rSelection.nStartPos, rSelection.nEndPara, rSelection.nEndPos ) );
@@ -1863,20 +1752,17 @@ void EditEngine::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemovePa
 
 Font EditEngine::GetStandardFont( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return GetStandardSvxFont( nPara );
 }
 
 SvxFont EditEngine::GetStandardSvxFont( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
     return pNode->GetCharAttribs().GetDefFont();
 }
 
 void EditEngine::StripPortions()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     VirtualDevice aTmpDev;
     Rectangle aBigRect( Point( 0, 0 ), Size( 0x7FFFFFFF, 0x7FFFFFFF ) );
     if ( IsVertical() )
@@ -1907,19 +1793,16 @@ void EditEngine::GetPortions( sal_Int32 nPara, std::vector<sal_uInt16>& rList )
 
 void EditEngine::SetFlatMode( sal_Bool bFlat)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetFlatMode( bFlat );
 }
 
 sal_Bool EditEngine::IsFlatMode() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return !( pImpEditEngine->aStatus.UseCharAttribs() );
 }
 
 void EditEngine::SetControlWord( sal_uInt32 nWord )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( nWord != pImpEditEngine->aStatus.GetControlWord() )
     {
@@ -1997,13 +1880,11 @@ void EditEngine::SetControlWord( sal_uInt32 nWord )
 
 sal_uInt32 EditEngine::GetControlWord() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->aStatus.GetControlWord();
 }
 
 long EditEngine::GetFirstLineStartX( sal_Int32 nParagraph )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     long nX = 0;
     const ParaPortion* pPPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nParagraph );
@@ -2031,7 +1912,6 @@ Point EditEngine::GetDocPos( const Point& rPaperPos ) const
 
 Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     const ParaPortion* pPPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nParagraph );
     DBG_ASSERT( pPPortion, "Paragraph not found: GetWindowPosTopLeft" );
     Point aPoint;
@@ -2075,13 +1955,11 @@ const SvxNumberFormat* EditEngine::GetNumberFormat( sal_Int32 nPara ) const
 
 sal_Bool EditEngine::IsRightToLeft( sal_Int32 nPara ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsRightToLeft( nPara );
 }
 
 sal_Bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
@@ -2113,19 +1991,16 @@ sal_Bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
 
 void EditEngine::SetEditTextObjectPool( SfxItemPool* pPool )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetEditTextObjectPool( pPool );
 }
 
 SfxItemPool* EditEngine::GetEditTextObjectPool() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetEditTextObjectPool();
 }
 
 void EditEngine::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     EditSelection aSel( pImpEditEngine->
         ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2135,7 +2010,6 @@ void EditEngine::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel
 
 void EditEngine::QuickMarkInvalid( const ESelection& rSel )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     DBG_ASSERT( rSel.nStartPara < pImpEditEngine->GetEditDoc().Count(), "MarkInvalid: Start out of Range!" );
     DBG_ASSERT( rSel.nEndPara < pImpEditEngine->GetEditDoc().Count(), "MarkInvalid: End out of Range!" );
     for ( sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
@@ -2148,7 +2022,6 @@ void EditEngine::QuickMarkInvalid( const ESelection& rSel )
 
 void EditEngine::QuickInsertText(const OUString& rText, const ESelection& rSel)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     EditSelection aSel( pImpEditEngine->
         ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2158,7 +2031,6 @@ void EditEngine::QuickInsertText(const OUString& rText, const ESelection& rSel)
 
 void EditEngine::QuickDelete( const ESelection& rSel )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     EditSelection aSel( pImpEditEngine->
         ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2168,7 +2040,6 @@ void EditEngine::QuickDelete( const ESelection& rSel )
 
 void EditEngine::QuickMarkToBeRepainted( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     ParaPortion* pPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nPara );
     if ( pPortion )
         pPortion->SetMustRepaint( sal_True );
@@ -2176,7 +2047,6 @@ void EditEngine::QuickMarkToBeRepainted( sal_Int32 nPara )
 
 void EditEngine::QuickInsertLineBreak( const ESelection& rSel )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     EditSelection aSel( pImpEditEngine->
         ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2186,7 +2056,6 @@ void EditEngine::QuickInsertLineBreak( const ESelection& rSel )
 
 void EditEngine::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     EditSelection aSel( pImpEditEngine->
         ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2196,7 +2065,6 @@ void EditEngine::QuickInsertField( const SvxFieldItem& rFld, const ESelection& r
 
 void EditEngine::QuickFormatDoc( sal_Bool bFull )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( bFull )
         pImpEditEngine->FormatFullDoc();
     else
@@ -2208,7 +2076,6 @@ void EditEngine::QuickFormatDoc( sal_Bool bFull )
 
 void EditEngine::QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->RemoveCharAttribs( nPara, nWhich );
 }
 
@@ -2219,37 +2086,31 @@ void EditEngine::SetStyleSheet(const EditSelection& aSel, SfxStyleSheet* pStyle)
 
 void EditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetStyleSheet( nPara, pStyle );
 }
 
 const SfxStyleSheet* EditEngine::GetStyleSheet( sal_Int32 nPara ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetStyleSheet( nPara );
 }
 
 SfxStyleSheet* EditEngine::GetStyleSheet( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetStyleSheet( nPara );
 }
 
 void EditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetStyleSheetPool( pSPool );
 }
 
 SfxStyleSheetPool* EditEngine::GetStyleSheetPool()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetStyleSheetPool();
 }
 
 void EditEngine::SetWordDelimiters( const OUString& rDelimiters )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->aWordDelimiters = rDelimiters;
     if (pImpEditEngine->aWordDelimiters.indexOf(CH_FEATURE) == -1)
         pImpEditEngine->aWordDelimiters += OUString(CH_FEATURE);
@@ -2257,31 +2118,26 @@ void EditEngine::SetWordDelimiters( const OUString& rDelimiters )
 
 OUString EditEngine::GetWordDelimiters() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->aWordDelimiters;
 }
 
 void EditEngine::EraseVirtualDevice()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EraseVirtualDevice();
 }
 
 void EditEngine::SetSpeller( Reference< XSpellChecker1 >  &xSpeller )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetSpeller( xSpeller );
 }
 
 Reference< XSpellChecker1 >  EditEngine::GetSpeller()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetSpeller();
 }
 
 void EditEngine::SetHyphenator( Reference< XHyphenator > & xHyph )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetHyphenator( xHyph );
 }
 
@@ -2297,31 +2153,26 @@ void EditEngine::SetAllMisspellRanges( const std::vector<editeng::MisspellRanges
 
 void EditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetForbiddenCharsTable( xForbiddenChars );
 }
 
 void EditEngine::SetDefaultLanguage( LanguageType eLang )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetDefaultLanguage( eLang );
 }
 
 LanguageType EditEngine::GetDefaultLanguage() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetDefaultLanguage();
 }
 
 sal_Bool EditEngine::SpellNextDocument()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return sal_False;
 }
 
 EESpellState EditEngine::HasSpellErrors()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->GetSpeller().is()  )
         return EE_SPELL_NOSPELLER;
 
@@ -2335,61 +2186,51 @@ void EditEngine::ClearSpellErrors()
 
 void EditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->StartSpelling(rEditView, bMultipleDoc);
 }
 
 bool EditEngine::SpellSentence(EditView& rView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking );
 }
 
 void EditEngine::PutSpellingToSentenceStart( EditView& rEditView )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->PutSpellingToSentenceStart( rEditView );
 }
 
 void EditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck  );
 }
 
 sal_Bool EditEngine::HasConvertibleTextPortion( LanguageType nLang )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->HasConvertibleTextPortion( nLang );
 }
 
 sal_Bool EditEngine::ConvertNextDocument()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return sal_False;
 }
 
 sal_Bool EditEngine::HasText( const SvxSearchItem& rSearchItem )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->HasText( rSearchItem );
 }
 
 void EditEngine::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetCharStretching( nX, nY );
 }
 
 void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->GetCharStretching( rX, rY );
 }
 
 sal_Bool EditEngine::ShouldCreateBigTextObject() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     sal_uInt32 nTextPortions = 0;
     sal_Int32 nParas = pImpEditEngine->GetEditDoc().Count();
     for ( sal_Int32 nPara = 0; nPara < nParas; nPara++  )
@@ -2449,7 +2290,6 @@ EFieldInfo EditEngine::GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const
 
 bool EditEngine::UpdateFields()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     sal_Bool bChanges = pImpEditEngine->UpdateFields();
     if ( bChanges )
         pImpEditEngine->FormatAndUpdate();
@@ -2463,7 +2303,6 @@ bool EditEngine::UpdateFieldsOnly()
 
 void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( bKeepFieldText )
         pImpEditEngine->UpdateFields();
@@ -2493,7 +2332,6 @@ void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
 
 sal_Bool EditEngine::HasOnlineSpellErrors() const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     sal_Int32 nNodes = pImpEditEngine->GetEditDoc().Count();
     for ( sal_Int32 n = 0; n < nNodes; n++ )
     {
@@ -2506,7 +2344,6 @@ sal_Bool EditEngine::HasOnlineSpellErrors() const
 
 void EditEngine::CompleteOnlineSpelling()
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     if ( pImpEditEngine->GetStatus().DoOnlineSpelling() )
     {
         if( !pImpEditEngine->IsFormatted() )
@@ -2553,7 +2390,6 @@ Rectangle EditEngine::GetCharacterBounds( const EPosition& rPos ) const
 
 ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     // This only works if not already in the format ...
     if ( !pImpEditEngine->IsFormatted() )
@@ -2584,7 +2420,6 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
                     EditEngine::CreateTransferable( const ESelection& rSelection ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->CreateSel( rSelection ) );
     return pImpEditEngine->CreateTransferable( aSel );
 }
@@ -2598,7 +2433,6 @@ void EditEngine::DrawingText( const Point&, const OUString&, sal_uInt16, sal_uIn
     const ::com::sun::star::lang::Locale*, const Color&, const Color&)
 
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
@@ -2608,17 +2442,14 @@ void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
                                       bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/,
                                       const Color& /*rTextLineColor*/)
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 void EditEngine::PaintingFirstLine( sal_Int32, const Point&, long, const Point&, short, OutputDevice* )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 void EditEngine::ParagraphInserted( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( GetNotifyHdl().IsSet() )
     {
@@ -2631,7 +2462,6 @@ void EditEngine::ParagraphInserted( sal_Int32 nPara )
 
 void EditEngine::ParagraphDeleted( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( GetNotifyHdl().IsSet() )
     {
@@ -2643,29 +2473,24 @@ void EditEngine::ParagraphDeleted( sal_Int32 nPara )
 }
 void EditEngine::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int32 /*nRightParagraph*/ )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 sal_Bool EditEngine::FormattingParagraph( sal_Int32 )
 {
     // return sal_True, if the Attribute was changed ...
-    DBG_CHKTHIS( EditEngine, 0 );
     return sal_False;
 }
 
 void EditEngine::ParaAttribsChanged( sal_Int32 /* nParagraph */ )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 void EditEngine::StyleSheetChanged( SfxStyleSheet* /* pStyle */ )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 
     if ( GetNotifyHdl().IsSet() )
     {
@@ -2678,7 +2503,6 @@ void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
 
 OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     OUString aComment;
     switch ( nId )
     {
@@ -2736,18 +2560,15 @@ Rectangle EditEngine::GetBulletArea( sal_Int32 )
 
 OUString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_uInt16, Color*&, Color*& )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
     return OUString(' ');
 }
 
 void EditEngine::FieldClicked( const SvxFieldItem&, sal_Int32, sal_uInt16 )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 void EditEngine::FieldSelected( const SvxFieldItem&, sal_Int32, sal_uInt16 )
 {
-    DBG_CHKTHIS( EditEngine, 0 );
 }
 
 // =====================================================================
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 6b4713ba4f72..eee3e24eafce 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -56,8 +56,6 @@ using std::endl;
 
 using namespace com::sun::star;
 
-DBG_NAME( EE_EditTextObject )
-DBG_NAME( XEditAttribute )
 
 //--------------------------------------------------------------
 
@@ -72,7 +70,6 @@ XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem
 
 XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
 {
-    DBG_CTOR( XEditAttribute, 0 );
     pItem = &rAttr;
     nStart = nS;
     nEnd = nE;
@@ -80,7 +77,6 @@ XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uIn
 
 XEditAttribute::~XEditAttribute()
 {
-    DBG_DTOR( XEditAttribute, 0 );
     pItem = 0;  // belongs to the Pool.
 }
 
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 48aacd8be787..3af0090b3753 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -26,7 +26,6 @@
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 
-DBG_NAME( EditUndo )
 
 static void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
 {
@@ -134,7 +133,6 @@ EditEngine* EditUndo::GetEditEngine()
 
 sal_uInt16 EditUndo::GetId() const
 {
-    DBG_CHKTHIS( EditUndo, 0 );
     return nId;
 }
 
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 7895f9226052..6616e1206d31 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -72,7 +72,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
 
-DBG_NAME( EditView )
 
 
 // static
@@ -160,33 +159,26 @@ LanguageType EditView::CheckLanguage(
 // ----------------------------------------------------------------------
 EditView::EditView( EditEngine* pEng, Window* pWindow )
 {
-    DBG_CTOR( EditView, 0 );
     pImpEditView = new ImpEditView( this, pEng, pWindow );
 }
 
 EditView::~EditView()
 {
-    DBG_DTOR( EditView, 0 );
     delete pImpEditView;
 }
 
 ImpEditEngine* EditView::GetImpEditEngine() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->pEditEngine->pImpEditEngine;
 }
 
 EditEngine* EditView::GetEditEngine() const
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->pEditEngine;
 }
 
 void EditView::Invalidate()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     if ( !pImpEditView->DoInvalidateMore() )
         pImpEditView->GetWindow()->Invalidate( pImpEditView->aOutArea );
     else
@@ -203,21 +195,16 @@ void EditView::Invalidate()
 
 void EditView::SetReadOnly( sal_Bool bReadOnly )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->bReadOnly = bReadOnly;
 }
 
 sal_Bool EditView::IsReadOnly() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->bReadOnly;
 }
 
 void EditView::SetSelection( const ESelection& rESel )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
     // If someone has just left an empty attribute, and then the outliner
     // manipulates the selection:
     if ( !pImpEditView->GetEditSelection().HasRange() )
@@ -255,9 +242,6 @@ void EditView::SetSelection( const ESelection& rESel )
 
 ESelection EditView::GetSelection() const
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
     ESelection aSelection;
 
     aSelection.nStartPara = PIMPE->GetEditDoc().GetPos( pImpEditView->GetEditSelection().Min().GetNode() );
@@ -271,35 +255,26 @@ ESelection EditView::GetSelection() const
 
 sal_Bool EditView::HasSelection() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->HasSelection();
 }
 
 void EditView::DeleteSelected()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     pImpEditView->DeleteSelected();
 }
 
 sal_uInt16 EditView::GetSelectedScriptType() const
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return PIMPE->GetScriptType( pImpEditView->GetEditSelection() );
 }
 
 void EditView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPEE->Paint( pImpEditView, rRect, pTargetDevice );
 }
 
 void EditView::SetEditEngine( EditEngine* pEditEng )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     pImpEditView->pEditEngine = pEditEng;
     EditSelection aStartSel;
     aStartSel = PIMPE->GetEditDoc().GetStartPaM();
@@ -308,26 +283,22 @@ void EditView::SetEditEngine( EditEngine* pEditEng )
 
 void EditView::SetWindow( Window* pWin )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->pOutWin = pWin;
     PIMPEE->GetSelEngine().Reset();
 }
 
 Window* EditView::GetWindow() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->pOutWin;
 }
 
 void EditView::SetVisArea( const Rectangle& rRect )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->SetVisDocStartPos( rRect.TopLeft() );
 }
 
 const Rectangle& EditView::GetVisArea() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     // Change return value to Rectangle in next incompatible build !!!
     static Rectangle aRect;
     aRect = pImpEditView->GetVisDocArea();
@@ -336,7 +307,6 @@ const Rectangle& EditView::GetVisArea() const
 
 void EditView::SetOutputArea( const Rectangle& rRect )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->SetOutputArea( rRect );
 
     // the rest here only if it is an API call:
@@ -348,26 +318,21 @@ void EditView::SetOutputArea( const Rectangle& rRect )
 
 const Rectangle& EditView::GetOutputArea() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->GetOutputArea();
 }
 
 const Pointer& EditView::GetPointer() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->GetPointer();
 }
 
 Cursor* EditView::GetCursor() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->pCursor;
 }
 
 void EditView::InsertText( const OUString& rStr, sal_Bool bSelect )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
 
     EditEngine* pEE = PIMPE;
     pImpEditView->DrawSelection();
@@ -397,43 +362,31 @@ void EditView::InsertText( const OUString& rStr, sal_Bool bSelect )
 
 sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin );
 }
 
 sal_Bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->MouseButtonUp( rMouseEvent );
 }
 
 sal_Bool EditView::MouseButtonDown( const MouseEvent& rMouseEvent )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->MouseButtonDown( rMouseEvent );
 }
 
 sal_Bool EditView::MouseMove( const MouseEvent& rMouseEvent )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->MouseMove( rMouseEvent );
 }
 
 void EditView::Command( const CommandEvent& rCEvt )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     pImpEditView->Command( rCEvt );
 }
 
 void EditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
 
     if ( pImpEditView->pEditEngine->HasView( this ) )
     {
@@ -446,28 +399,21 @@ void EditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor )
 
 void EditView::HideCursor()
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->GetCursor()->Hide();
 }
 
 Pair EditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->Scroll( ndX, ndY, nRangeCheck );
 }
 
 const SfxItemSet& EditView::GetEmptyItemSet()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return PIMPE->GetEmptyItemSet();
 }
 
 void EditView::SetAttribs( const SfxItemSet& rSet )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     DBG_ASSERT( !pImpEditView->aEditSelection.IsInvalid(), "Blind Selection in ...." );
 
     pImpEditView->DrawSelection();
@@ -477,8 +423,6 @@ void EditView::SetAttribs( const SfxItemSet& rSet )
 
 void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
 
     pImpEditView->DrawSelection();
     PIMPE->UndoActionStart( EDITUNDO_RESETATTRIBS );
@@ -499,8 +443,6 @@ void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
 
 void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
 
     pImpEditView->DrawSelection();
     PIMPE->UndoActionStart( EDITUNDO_RESETATTRIBS );
@@ -511,8 +453,6 @@ void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
 
 void EditView::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPE->UndoActionStart( EDITUNDO_RESETATTRIBS );
     PIMPE->RemoveCharAttribs( nPara, nWhich );
     PIMPE->UndoActionEnd( EDITUNDO_RESETATTRIBS );
@@ -521,30 +461,22 @@ void EditView::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
 
 SfxItemSet EditView::GetAttribs()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     DBG_ASSERT( !pImpEditView->aEditSelection.IsInvalid(), "Blind Selection in ...." );
     return PIMPEE->GetAttribs( pImpEditView->GetEditSelection() );
 }
 
 void EditView::Undo()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPE->Undo( this );
 }
 
 void EditView::Redo()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPE->Redo( this );
 }
 
 sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     EditSelection aOldSel( pImpEditView->GetEditSelection() );
     pImpEditView->DrawSelection();
     PIMPEE->UndoActionStart( EDITUNDO_READ );
@@ -566,7 +498,6 @@ sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextForm
 
 void EditView::Cut()
 {
-    DBG_CHKTHIS( EditView, 0 );
     Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
     pImpEditView->CutCopy( aClipBoard, sal_True );
 }
@@ -580,50 +511,40 @@ void EditView::Cut()
 
 void EditView::Copy()
 {
-    DBG_CHKTHIS( EditView, 0 );
     Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
     pImpEditView->CutCopy( aClipBoard, sal_False );
 }
 
 void EditView::Paste()
 {
-    DBG_CHKTHIS( EditView, 0 );
     Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
     pImpEditView->Paste( aClipBoard, sal_False );
 }
 
 void EditView::PasteSpecial()
 {
-    DBG_CHKTHIS( EditView, 0 );
     Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
     pImpEditView->Paste(aClipBoard, sal_True );
 }
 
 Point EditView::GetWindowPosTopLeft( sal_Int32 nParagraph )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     Point aDocPos( pImpEditView->pEditEngine->GetDocPosTopLeft( nParagraph ) );
     return pImpEditView->GetWindowPos( aDocPos );
 }
 
 void EditView::SetSelectionMode( EESelectionMode eMode )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->SetSelectionMode( eMode );
 }
 
 OUString EditView::GetSelected()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return PIMPEE->GetSelected( pImpEditView->GetEditSelection() );
 }
 
 void EditView::MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPEE->UndoActionStart( EDITUNDO_MOVEPARAS );
     PIMPEE->MoveParagraphs( aParagraphs, nNewPos, this );
     PIMPEE->UndoActionEnd( EDITUNDO_MOVEPARAS );
@@ -631,8 +552,6 @@ void EditView::MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos )
 
 void EditView::MoveParagraphs( long nDiff )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     ESelection aSel = GetSelection();
     Range aRange( aSel.nStartPara, aSel.nEndPara );
     aRange.Justify();
@@ -645,41 +564,31 @@ void EditView::MoveParagraphs( long nDiff )
 
 void EditView::SetBackgroundColor( const Color& rColor )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     pImpEditView->SetBackgroundColor( rColor );
 }
 
 Color EditView::GetBackgroundColor() const
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->GetBackgroundColor();
 }
 
 void EditView::SetControlWord( sal_uInt32 nWord )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->nControl = nWord;
 }
 
 sal_uInt32 EditView::GetControlWord() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->nControl;
 }
 
 EditTextObject* EditView::CreateTextObject()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return PIMPEE->CreateTextObject( pImpEditView->GetEditSelection() );
 }
 
 void EditView::InsertText( const EditTextObject& rTextObject )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     pImpEditView->DrawSelection();
 
     PIMPE->UndoActionStart( EDITUNDO_INSERT );
@@ -693,9 +602,6 @@ void EditView::InsertText( const EditTextObject& rTextObject )
 
 void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, sal_Bool bUseSpecial )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
     PIMPE->UndoActionStart( EDITUNDO_INSERT );
     pImpEditView->DeleteSelected();
     EditSelection aTextSel =
@@ -709,24 +615,16 @@ void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::d
 
 void EditView::SetEditEngineUpdateMode( sal_Bool bUpdate )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPEE->SetUpdateMode( bUpdate, this );
 }
 
 void EditView::ForceUpdate()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPEE->SetUpdateMode( sal_True, this, sal_True );
 }
 
 SfxStyleSheet* EditView::GetStyleSheet()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
-
     EditSelection aSel( pImpEditView->GetEditSelection() );
     aSel.Adjust( PIMPE->GetEditDoc() );
     sal_Int32 nStartPara = PIMPE->GetEditDoc().GetPos( aSel.Min().GetNode() );
@@ -750,31 +648,26 @@ const SfxStyleSheet* EditView::GetStyleSheet() const
 
 sal_Bool EditView::IsInsertMode() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->IsInsertMode();
 }
 
 void EditView::SetInsertMode( sal_Bool bInsert )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->SetInsertMode( bInsert );
 }
 
 void EditView::SetAnchorMode( EVAnchorMode eMode )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->SetAnchorMode( eMode );
 }
 
 EVAnchorMode EditView::GetAnchorMode() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->GetAnchorMode();
 }
 
 void EditView::TransliterateText( sal_Int32 nTransliterationMode )
 {
-    DBG_CHKTHIS( EditView, 0 );
     EditSelection aOldSel( pImpEditView->GetEditSelection() );
     EditSelection aNewSel = PIMPE->TransliterateText( pImpEditView->GetEditSelection(), nTransliterationMode );
     if ( aNewSel != aOldSel )
@@ -787,8 +680,6 @@ void EditView::TransliterateText( sal_Int32 nTransliterationMode )
 
 void EditView::CompleteAutoCorrect( Window* pFrameWin )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     if ( !pImpEditView->HasSelection() && PIMPEE->GetStatus().DoAutoCorrect() )
     {
         pImpEditView->DrawSelection();
@@ -803,8 +694,6 @@ void EditView::CompleteAutoCorrect( Window* pFrameWin )
 
 EESpellState EditView::StartSpeller( sal_Bool bMultipleDoc )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     if ( !PIMPEE->GetSpeller().is() )
         return EE_SPELL_NOSPELLER;
 
@@ -813,8 +702,6 @@ EESpellState EditView::StartSpeller( sal_Bool bMultipleDoc )
 
 EESpellState EditView::StartThesaurus()
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     if ( !PIMPEE->GetSpeller().is() )
         return EE_SPELL_NOSPELLER;
 
@@ -826,23 +713,17 @@ void EditView::StartTextConversion(
         LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
         sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPEE->Convert( this, nSrcLang, nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc );
 }
 
 
 sal_uInt16 EditView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return PIMPEE->StartSearchAndReplace( this, rSearchItem );
 }
 
 sal_Bool EditView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     sal_Bool bIsWrong = sal_False;
     if ( !HasSelection() )
     {
@@ -854,8 +735,6 @@ sal_Bool EditView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
 
 sal_Bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     Point aPos ( pImpEditView->GetWindow()->PixelToLogic( rPosPixel ) );
     aPos = pImpEditView->GetDocPos( aPos );
     EditPaM aPaM = pImpEditView->pEditEngine->GetPaM(aPos, false);
@@ -864,8 +743,6 @@ sal_Bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMa
 
 void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
 
     Point aPos ( pImpEditView->GetWindow()->PixelToLogic( rPosPixel ) );
     aPos = pImpEditView->GetDocPos( aPos );
@@ -1146,8 +1023,6 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
 
 sal_Bool EditView::SelectCurrentWord( sal_Int16 nWordType )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     EditSelection aCurSel( pImpEditView->GetEditSelection() );
     pImpEditView->DrawSelection();
     aCurSel = PIMPE->SelectWord(aCurSel.Max(), nWordType);
@@ -1159,9 +1034,6 @@ sal_Bool EditView::SelectCurrentWord( sal_Int16 nWordType )
 
 void EditView::InsertField( const SvxFieldItem& rFld )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
     EditEngine* pEE = PIMPE;
     pImpEditView->DrawSelection();
     pEE->UndoActionStart( EDITUNDO_INSERT );
@@ -1174,7 +1046,6 @@ void EditView::InsertField( const SvxFieldItem& rFld )
 
 const SvxFieldItem* EditView::GetFieldUnderMousePointer() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     sal_Int32 nPara;
     sal_uInt16 nPos;
     return GetFieldUnderMousePointer( nPara, nPos );
@@ -1182,15 +1053,11 @@ const SvxFieldItem* EditView::GetFieldUnderMousePointer() const
 
 const SvxFieldItem* EditView::GetField( const Point& rPos, sal_Int32* pPara, sal_uInt16* pPos ) const
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->GetField( rPos, pPara, pPos );
 }
 
 const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, sal_uInt16& nPos ) const
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     Point aPos = pImpEditView->GetWindow()->GetPointerPosPixel();
     aPos = pImpEditView->GetWindow()->PixelToLogic( aPos );
     return GetField( aPos, &nPara, &nPos );
@@ -1225,13 +1092,11 @@ const SvxFieldItem* EditView::GetFieldAtSelection() const
 
 void EditView::SetInvalidateMore( sal_uInt16 nPixel )
 {
-    DBG_CHKTHIS( EditView, 0 );
     pImpEditView->SetInvalidateMore( nPixel );
 }
 
 sal_uInt16 EditView::GetInvalidateMore() const
 {
-    DBG_CHKTHIS( EditView, 0 );
     return (sal_uInt16)pImpEditView->GetInvalidateMore();
 }
 
@@ -1252,8 +1117,6 @@ static void ChangeFontSizeImpl( EditView* pEditView, bool bGrow, const ESelectio
 
 void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList )
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
 
     EditEngine& rEditEngine = *pImpEditView->pEditEngine;
 
@@ -1393,9 +1256,6 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo
 
 OUString EditView::GetSurroundingText() const
 {
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
     EditSelection aSel( pImpEditView->GetEditSelection() );
     aSel.Adjust( PIMPE->GetEditDoc() );
 
@@ -1419,8 +1279,6 @@ OUString EditView::GetSurroundingText() const
 
 Selection EditView::GetSurroundingTextSelection() const
 {
-    DBG_CHKTHIS( EditView, 0 );
-
     ESelection aSelection( GetSelection() );
     aSelection.Adjust();
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index d86e21f3e186..dc3211bbbaa5 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -53,8 +53,6 @@
 
 #include <boost/noncopyable.hpp>
 
-DBG_NAMEEX( EditView )
-DBG_NAMEEX( EditEngine )
 
 #define PIMPE       pImpEditView->pEditEngine
 
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index ec528628206d..f81356d15cd5 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -617,7 +617,6 @@ EditPaM ImpEditEngine::Clear()
     for (size_t nView = aEditViews.size(); nView; )
     {
         EditView* pView = aEditViews[--nView];
-        DBG_CHKOBJ( pView, EditView, 0 );
         pView->pImpEditView->SetEditSelection( aSel );
     }
 
@@ -633,7 +632,6 @@ EditPaM ImpEditEngine::RemoveText()
     for (size_t nView = 0; nView < aEditViews.size(); ++nView)
     {
         EditView* pView = aEditViews[nView];
-        DBG_CHKOBJ( pView, EditView, 0 );
         pView->pImpEditView->SetEditSelection( aEmptySel );
     }
     ResetUndoManager();
@@ -657,7 +655,6 @@ void ImpEditEngine::SetText(const OUString& rText)
     for (size_t nView = 0; nView < aEditViews.size(); ++nView)
     {
         EditView* pView = aEditViews[nView];
-        DBG_CHKOBJ( pView, EditView, 0 );
         pView->pImpEditView->SetEditSelection( EditSelection( aPaM, aPaM ) );
         //  If no text then also no Format&Update
         // => The text remains.
@@ -3299,7 +3296,6 @@ void ImpEditEngine::UpdateSelections()
     for (size_t nView = 0; nView < aEditViews.size(); ++nView)
     {
         EditView* pView = aEditViews[nView];
-        DBG_CHKOBJ( pView, EditView, 0 );
         EditSelection aCurSel( pView->pImpEditView->GetEditSelection() );
         bool bChanged = false;
         for (size_t i = 0, n = aDeletedNodes.size(); i < n; ++i)
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 5fc405c4855f..80a338055e6d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -281,7 +281,6 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
     for (size_t nView = 0; nView < aEditViews.size(); ++nView)
     {
         EditView* pView = aEditViews[nView];
-        DBG_CHKOBJ( pView, EditView, 0 );
         pView->HideCursor();
 
         Rectangle aClipRect( aInvalidRect );
@@ -3643,7 +3642,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
 void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice, sal_Bool bUseVirtDev )
 {
     DBG_ASSERT( pView, "No View - No Paint!" );
-    DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
     if ( !GetUpdateMode() || IsInUndo() )
         return;
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 515565cef199..4a0284aae2fd 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2255,7 +2255,6 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, bool bSpellAtC
     EditPaM aCursorPos;
     if( pActiveView && !bSpellAtCursorPos )
     {
-        DBG_CHKOBJ( pActiveView, EditView, 0 );
         aCursorPos = pActiveView->pImpEditView->GetEditSelection().Max();
     }
 
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index c92af7915d7a..56b5486a22fc 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -142,7 +142,6 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     // So that not a lot of unnecessary formatting is done when destructing:
     if ( !bDowning )
     {
-        DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
         SfxStyleSheet* pStyle = NULL;
         sal_uLong nId = 0;
@@ -306,7 +305,6 @@ sal_Bool ImpEditEngine::Redo( EditView* pView )
 
 SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib )
 {
-    DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
     aSel.Adjust( aEditDoc );
 
@@ -398,7 +396,6 @@ SfxItemSet ImpEditEngine::GetAttribs( sal_Int32 nPara, sal_uInt16 nStart, sal_uI
     // Optimized function with less Puts(), which cause unnecessary cloning from default items.
     // If this works, change GetAttribs( EditSelection ) to use this for each paragraph and merge the results!
 
-    DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
     ContentNode* pNode = const_cast<ContentNode*>(aEditDoc.GetObject(nPara));
     DBG_ASSERT( pNode, "GetAttribs - unknown paragraph!" );
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 91e7cb07749c..ea53121f112d 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -38,7 +38,6 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 
-DBG_NAMEEX(Outliner)
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
@@ -49,93 +48,78 @@ using namespace ::com::sun::star::linguistic2;
 
 void Outliner::SetUpdateMode( sal_Bool bUpdate )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
 
 sal_Bool Outliner::GetUpdateMode() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetUpdateMode();
 }
 
 const SfxItemSet& Outliner::GetEmptyItemSet() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetEmptyItemSet();
 }
 
 void Outliner::EnableUndo( sal_Bool bEnable )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->EnableUndo( bEnable );
 }
 
 sal_Bool Outliner::IsUndoEnabled() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsUndoEnabled();
 }
 
 MapMode Outliner::GetRefMapMode() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetRefMapMode();
 }
 
 void Outliner::SetRefMapMode( const MapMode& rMMode )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetRefMapMode( rMMode );
 }
 
 void Outliner::SetBackgroundColor( const Color& rColor )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetBackgroundColor( rColor );
 }
 
 Color Outliner::GetBackgroundColor() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetBackgroundColor();
 }
 
 
 void Outliner::ClearModifyFlag()
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->ClearModifyFlag();
 }
 
 sal_Bool Outliner::IsModified() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsModified();
 }
 
 sal_uLong Outliner::GetTextHeight() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetTextHeight();
 }
 
 void Outliner::SetModifyHdl( const Link& rLink )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetModifyHdl( rLink );
 }
 
 Link Outliner::GetModifyHdl() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetModifyHdl();
 }
 
 void Outliner::SetNotifyHdl( const Link& rLink )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->aOutlinerNotifyHdl = rLink;
 
     if ( rLink.IsSet() )
@@ -147,361 +131,301 @@ void Outliner::SetNotifyHdl( const Link& rLink )
 
 void Outliner::SetStatusEventHdl( const Link& rLink )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetStatusEventHdl( rLink );
 }
 
 Link Outliner::GetStatusEventHdl() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetStatusEventHdl();
 }
 
 void Outliner::SetDefTab( sal_uInt16 nTab )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetDefTab( nTab );
 }
 
 sal_Bool Outliner::IsFlatMode() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsFlatMode();
 }
 
 sal_Bool Outliner::UpdateFields()
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->UpdateFields();
 }
 
 void Outliner::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->RemoveFields( bKeepFieldText, aType );
 }
 
 void Outliner::SetWordDelimiters( const OUString& rDelimiters )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetWordDelimiters( rDelimiters );
 }
 
 OUString Outliner::GetWordDelimiters() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetWordDelimiters();
 }
 
 OUString Outliner::GetWord( sal_Int32 nPara, sal_uInt16 nIndex )
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetWord( nPara, nIndex );
 }
 
 void Outliner::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->Draw( pOutDev, rOutRect );
 }
 
 void Outliner::Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->Draw( pOutDev, rStartPos, nOrientation );
 }
 
 void Outliner::SetPaperSize( const Size& rSize )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetPaperSize( rSize );
 }
 
 const Size& Outliner::GetPaperSize() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetPaperSize();
 }
 
 void Outliner::SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon )
 {
-    DBG_CHKTHIS( Outliner, 0 );
     pEditEngine->SetPolygon( rPolyPolygon );
 }
 
 void Outliner::SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon)
 {
-    DBG_CHKTHIS( Outliner, 0 );
     pEditEngine->SetPolygon( rPolyPolygon, pLinePolyPolygon);
 }
 
 void Outliner::ClearPolygon()
 {
-    DBG_CHKTHIS( Outliner, 0 );
     pEditEngine->ClearPolygon();
 }
 
 const Size& Outliner::GetMinAutoPaperSize() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetMinAutoPaperSize();
 }
 
 void Outliner::SetMinAutoPaperSize( const Size& rSz )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetMinAutoPaperSize( rSz );
 }
 
 const Size& Outliner::GetMaxAutoPaperSize() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetMaxAutoPaperSize();
 }
 
 void Outliner::SetMaxAutoPaperSize( const Size& rSz )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetMaxAutoPaperSize( rSz );
 }
 
 sal_Bool Outliner::IsExpanded( Paragraph* pPara ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pParaList->HasVisibleChildren( pPara );
 }
 
 Paragraph* Outliner::GetParent( Paragraph* pParagraph ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pParaList->GetParent( pParagraph );
 }
 
 sal_Int32 Outliner::GetChildCount( Paragraph* pParent ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pParaList->GetChildCount( pParent );
 }
 
 Size Outliner::CalcTextSize()
 {
-    DBG_CHKTHIS(Outliner,0);
     return Size(pEditEngine->CalcTextWidth(),pEditEngine->GetTextHeight());
 }
 
 Size Outliner::CalcTextSizeNTP()
 {
-    DBG_CHKTHIS(Outliner,0);
     return Size(pEditEngine->CalcTextWidth(),pEditEngine->GetTextHeightNTP());
 }
 
 void Outliner::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetStyleSheetPool( pSPool );
 }
 
 SfxStyleSheetPool* Outliner::GetStyleSheetPool()
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetStyleSheetPool();
 }
 
 SfxStyleSheet* Outliner::GetStyleSheet( sal_Int32 nPara )
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetStyleSheet( nPara );
 }
 
 sal_Bool Outliner::IsInSelectionMode() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsInSelectionMode();
 }
 
 void Outliner::SetControlWord( sal_uLong nWord )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetControlWord( nWord );
 }
 
 sal_uLong Outliner::GetControlWord() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetControlWord();
 }
 
 void Outliner::SetAsianCompressionMode( sal_uInt16 n )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetAsianCompressionMode( n );
 }
 
 void Outliner::SetKernAsianPunctuation( sal_Bool b )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetKernAsianPunctuation( b );
 }
 
 void Outliner::SetAddExtLeading( sal_Bool bExtLeading )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetAddExtLeading( bExtLeading );
 }
 
 void Outliner::UndoActionStart( sal_uInt16 nId )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->UndoActionStart( nId );
 }
 
 void Outliner::UndoActionEnd( sal_uInt16 nId )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->UndoActionEnd( nId );
 }
 
 void Outliner::InsertUndo( EditUndo* pUndo )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->GetUndoManager().AddUndoAction( pUndo, sal_False );
 }
 
 sal_Bool Outliner::IsInUndo()
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsInUndo();
 }
 
 sal_uLong Outliner::GetLineCount( sal_Int32 nParagraph ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetLineCount( nParagraph );
 }
 
 sal_uInt16 Outliner::GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetLineLen( nParagraph, nLine );
 }
 
 sal_uLong Outliner::GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine )
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetLineHeight( nParagraph, nLine );
 }
 
 void Outliner::QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->QuickRemoveCharAttribs( nPara, nWhich );
 }
 
 EESpellState Outliner::HasSpellErrors()
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->HasSpellErrors();
 }
 
 sal_Bool Outliner::HasConvertibleTextPortion( LanguageType nLang )
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->HasConvertibleTextPortion( nLang );
 }
 
 sal_Bool Outliner::ConvertNextDocument()
 {
-    DBG_CHKTHIS(Outliner,0);
     return sal_False;
 }
 
 void Outliner::SetDefaultLanguage( LanguageType eLang )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetDefaultLanguage( eLang );
 }
 
 LanguageType Outliner::GetDefaultLanguage() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetDefaultLanguage();
 }
 
 void Outliner::CompleteOnlineSpelling()
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->CompleteOnlineSpelling();
 }
 
 sal_Bool Outliner::HasText( const SvxSearchItem& rSearchItem )
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->HasText( rSearchItem );
 }
 
 void Outliner::SetEditTextObjectPool( SfxItemPool* pPool )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetEditTextObjectPool( pPool );
 }
 
 SfxItemPool* Outliner::GetEditTextObjectPool() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetEditTextObjectPool();
 }
 
 sal_Bool Outliner::SpellNextDocument()
 {
-    DBG_CHKTHIS(Outliner,0);
     return sal_False;
 }
 
 
 void Outliner::SetSpeller( Reference< XSpellChecker1 > &xSpeller )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetSpeller( xSpeller );
 }
 Reference< XSpellChecker1 > Outliner::GetSpeller()
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetSpeller();
 }
 
 void Outliner::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetForbiddenCharsTable( xForbiddenChars );
 }
 
 void Outliner::SetHyphenator( Reference< XHyphenator >& xHyph )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetHyphenator( xHyph );
 }
 
 OutputDevice* Outliner::GetRefDevice() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetRefDevice();
 }
 
 sal_uLong Outliner::GetTextHeight( sal_Int32 nParagraph ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetTextHeight(nParagraph );
 }
 
 Point Outliner::GetDocPos( const Point& rPaperPos ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetDocPos( rPaperPos );
 }
 
 Point Outliner::GetDocPosTopLeft( sal_Int32 nParagraph )
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetDocPosTopLeft( nParagraph );
 }
 
@@ -512,7 +436,6 @@ sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
 
 sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBullet )
 {
-    DBG_CHKTHIS(Outliner,0);
     if ( pbBullet)
         *pbBullet = sal_False;
     sal_Bool bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder );
@@ -537,7 +460,6 @@ sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bo
 
 void Outliner::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->QuickSetAttribs( rSet, rSel );
 }
 
@@ -555,27 +477,23 @@ void Outliner::QuickDelete( const ESelection& rSel )
 
 void Outliner::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
 {
-    DBG_CHKTHIS(Outliner,0);
     bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertField( rFld, rSel );
 }
 
 void Outliner::QuickInsertLineBreak( const ESelection& rSel )
 {
-    DBG_CHKTHIS(Outliner,0);
     bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertLineBreak( rSel );
 }
 
 void Outliner::QuickFormatDoc( sal_Bool bFull )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->QuickFormatDoc( bFull );
 }
 
 void Outliner::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     // reset bullet size
     sal_Int32 nParagraphs = pParaList->GetParagraphCount();
@@ -591,43 +509,36 @@ void Outliner::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
 
 void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->GetGlobalCharStretching( rX, rY );
 }
 
 void Outliner::EraseVirtualDevice()
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->EraseVirtualDevice();
 }
 
 sal_Bool Outliner::ShouldCreateBigTextObject() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->ShouldCreateBigTextObject();
 }
 
 void Outliner::SetVertical( sal_Bool b )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetVertical( b );
 }
 
 sal_Bool Outliner::IsVertical() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsVertical();
 }
 
 void Outliner::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
 }
 
 void Outliner::SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetDefaultHorizontalTextDirection( eHTextDir );
 }
 
@@ -638,37 +549,31 @@ EEHorizontalTextDirection Outliner::GetDefaultHorizontalTextDirection() const
 
 sal_uInt16 Outliner::GetScriptType( const ESelection& rSelection ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetScriptType( rSelection );
 }
 
 LanguageType Outliner::GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetLanguage( nPara, nPos );
 }
 
 void Outliner::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
 }
 
 void Outliner::EnableAutoColor( sal_Bool b )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->EnableAutoColor( b );
 }
 
 void Outliner::ForceAutoColor( sal_Bool b )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->ForceAutoColor( b );
 }
 
 sal_Bool Outliner::IsForceAutoColor() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsForceAutoColor();
 }
 
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 137267a00850..ba28f04635c5 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -59,7 +59,6 @@ using ::std::advance;
 // ----------------------------------------------------------------------
 // Outliner
 // ----------------------------------------------------------------------
-DBG_NAME(Outliner);
 
 void Outliner::ImplCheckDepth( sal_Int16& rnDepth ) const
 {
@@ -71,7 +70,6 @@ void Outliner::ImplCheckDepth( sal_Int16& rnDepth ) const
 
 Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 nAbsPos, sal_Int16 nDepth)
 {
-    DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pParaList->GetParagraphCount(),"Insert:No Paras");
 
     Paragraph* pPara;
@@ -121,7 +119,6 @@ Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 nAbsPos, sal_Int16
 
 void Outliner::ParagraphInserted( sal_Int32 nPara )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if ( bBlockInsCallback )
         return;
@@ -159,7 +156,6 @@ void Outliner::ParagraphInserted( sal_Int32 nPara )
 
 void Outliner::ParagraphDeleted( sal_Int32 nPara )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if ( bBlockInsCallback || ( nPara == EE_PARA_ALL ) )
         return;
@@ -261,7 +257,6 @@ sal_Int16 Outliner::GetDepth( sal_Int32 nPara ) const
 
 void Outliner::SetDepth( Paragraph* pPara, sal_Int16 nNewDepth )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     ImplCheckDepth( nNewDepth );
 
@@ -388,7 +383,6 @@ sal_Int32 Outliner::GetBulletsNumberingStatus() const
 
 OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 nCount ) const
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if ( static_cast<sal_uLong>(nStartPara) + nCount >
             static_cast<sal_uLong>(pParaList->GetParagraphCount()) )
@@ -421,7 +415,6 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32
 
 void Outliner::SetText( const OUString& rText, Paragraph* pPara )
 {
-    DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pPara,"SetText:No Para");
 
     sal_Bool bUpdate = pEditEngine->GetUpdateMode();
@@ -507,7 +500,6 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara )
 
 bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView)
 {
-    DBG_CHKTHIS(Outliner,0);
 
     bool bConverted = false;
     sal_uInt16 nTabs = 0;
@@ -585,7 +577,6 @@ bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView)
 
 void Outliner::SetText( const OutlinerParaObject& rPObj )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     sal_Bool bUpdate = pEditEngine->GetUpdateMode();
     pEditEngine->SetUpdateMode( sal_False );
@@ -622,7 +613,6 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
 
 void Outliner::AddText( const OutlinerParaObject& rPObj )
 {
-    DBG_CHKTHIS(Outliner,0);
     Paragraph* pPara;
 
     sal_Bool bUpdate = pEditEngine->GetUpdateMode();
@@ -661,7 +651,6 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
 
 void Outliner::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if ( aFieldClickedHdl.IsSet() )
     {
@@ -674,7 +663,6 @@ void Outliner::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_uI
 
 void Outliner::FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos )
 {
-    DBG_CHKTHIS(Outliner,0);
     if ( !aFieldClickedHdl.IsSet() )
         return;
 
@@ -686,7 +674,6 @@ void Outliner::FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_u
 
 OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
-    DBG_CHKTHIS(Outliner,0);
     if ( !aCalcFieldValueHdl.IsSet() )
         return OUString( ' ' );
 
@@ -710,7 +697,6 @@ OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara,
 
 void Outliner::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle )
 {
-    DBG_CHKTHIS(Outliner,0);
     Paragraph* pPara = pParaList->GetParagraph( nPara );
         if (pPara)
         {
@@ -729,7 +715,6 @@ void Outliner::ImplCheckNumBulletItem( sal_Int32 nPara )
 
 void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     DBG_ASSERT( ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) || ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW ), "SetLevelDependendStyleSheet: Wrong Mode!" );
 
@@ -764,7 +749,6 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet*
 
 void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     DBG_ASSERT( ( nDepth >= nMinDepth ) && ( nDepth <= nMaxDepth ), "ImplInitDepth - Depth is invalid!" );
 
@@ -804,14 +788,12 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreat
 
 void Outliner::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     pEditEngine->SetParaAttribs( nPara, rSet );
 }
 
 sal_Bool Outliner::Expand( Paragraph* pPara )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if ( pParaList->HasHiddenChildren( pPara ) )
     {
@@ -842,7 +824,6 @@ sal_Bool Outliner::Expand( Paragraph* pPara )
 
 sal_Bool Outliner::Collapse( Paragraph* pPara )
 {
-    DBG_CHKTHIS(Outliner,0);
     if ( pParaList->HasVisibleChildren( pPara ) ) // expanded
     {
         OLUndoExpand* pUndo = 0;
@@ -942,7 +923,6 @@ Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
 void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
     const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     bool bDrawBullet = false;
     if (pEditEngine)
@@ -1128,7 +1108,6 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
 
 void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_Int32 nPara )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     long nLineHeight = (long)pEditEngine->GetLineHeight(nPara );
     for ( size_t i = 0, n = aViewList.size(); i < n; ++i )
@@ -1147,7 +1126,6 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_Int32 nPara )
 
 sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     sal_Bool bOldUndo = pEditEngine->IsUndoEnabled();
     EnableUndo( sal_False );
@@ -1193,7 +1171,6 @@ sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16
 
 void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     sal_Bool bUpdate = pEditEngine->GetUpdateMode();
     pEditEngine->SetUpdateMode( sal_False );
@@ -1223,19 +1200,16 @@ void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara )
 
 ::svl::IUndoManager& Outliner::GetUndoManager()
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetUndoManager();
 }
 
 ::svl::IUndoManager* Outliner::SetUndoManager(::svl::IUndoManager* pNew)
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->SetUndoManager(pNew);
 }
 
 void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     sal_Bool bUpdate = pEditEngine->GetUpdateMode();
     pEditEngine->SetUpdateMode( sal_False );
@@ -1287,7 +1261,6 @@ void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount )
 
 long Outliner::IndentingPagesHdl( OutlinerView* pView )
 {
-    DBG_CHKTHIS(Outliner,0);
     if( !aIndentingPagesHdl.IsSet() )
         return 1;
     return aIndentingPagesHdl.Call( pView );
@@ -1295,7 +1268,6 @@ long Outliner::IndentingPagesHdl( OutlinerView* pView )
 
 sal_Bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
 {
-    DBG_CHKTHIS(Outliner,0);
     // The selected pages must already be set in advance through
     // ImpCalcSelectedPages
 
@@ -1314,7 +1286,6 @@ sal_Bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
 
 sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
 {
-    DBG_CHKTHIS(Outliner,0);
     // The selected pages must already be set in advance through
     // ImpCalcSelectedPages
     return (sal_Bool)RemovingPagesHdl( pCurView );
@@ -1323,7 +1294,6 @@ sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
 Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode )
 : nMinDepth( -1 )
 {
-    DBG_CTOR( Outliner, 0 );
 
     bStrippingPortions  = sal_False;
     bPasting            = sal_False;
@@ -1350,7 +1320,6 @@ Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode )
 
 Outliner::~Outliner()
 {
-    DBG_DTOR(Outliner,0);
 
     pParaList->Clear( sal_True );
     delete pParaList;
@@ -1359,7 +1328,6 @@ Outliner::~Outliner()
 
 size_t Outliner::InsertView( OutlinerView* pView, size_t nIndex )
 {
-    DBG_CHKTHIS(Outliner,0);
     size_t ActualIndex;
 
     if ( nIndex >= aViewList.size() )
@@ -1379,7 +1347,6 @@ size_t Outliner::InsertView( OutlinerView* pView, size_t nIndex )
 
 OutlinerView* Outliner::RemoveView( OutlinerView* pView )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     for ( ViewList::iterator it = aViewList.begin(); it != aViewList.end(); ++it )
     {
@@ -1396,7 +1363,6 @@ OutlinerView* Outliner::RemoveView( OutlinerView* pView )
 
 OutlinerView* Outliner::RemoveView( size_t nIndex )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     EditView* pEditView = pEditEngine->GetView( (sal_uInt16)nIndex );
     pEditView->HideCursor(); // HACK
@@ -1415,19 +1381,16 @@ OutlinerView* Outliner::RemoveView( size_t nIndex )
 
 OutlinerView* Outliner::GetView( size_t nIndex ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return ( nIndex >= aViewList.size() ) ? NULL : aViewList[ nIndex ];
 }
 
 size_t Outliner::GetViewCount() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return aViewList.size();
 }
 
 void Outliner::ParagraphInsertedHdl()
 {
-    DBG_CHKTHIS(Outliner,0);
     if( !IsInUndo() )
         aParaInsertedHdl.Call( this );
 }
@@ -1435,7 +1398,6 @@ void Outliner::ParagraphInsertedHdl()
 
 void Outliner::ParagraphRemovingHdl()
 {
-    DBG_CHKTHIS(Outliner,0);
     if( !IsInUndo() )
         aParaRemovingHdl.Call( this );
 }
@@ -1443,7 +1405,6 @@ void Outliner::ParagraphRemovingHdl()
 
 void Outliner::DepthChangedHdl()
 {
-    DBG_CHKTHIS(Outliner,0);
     if( !IsInUndo() )
         aDepthChangedHdl.Call( this );
 }
@@ -1451,26 +1412,22 @@ void Outliner::DepthChangedHdl()
 
 sal_Int32 Outliner::GetAbsPos( Paragraph* pPara )
 {
-    DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pPara,"GetAbsPos:No Para");
     return pParaList->GetAbsPos( pPara );
 }
 
 sal_Int32 Outliner::GetParagraphCount() const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pParaList->GetParagraphCount();
 }
 
 Paragraph* Outliner::GetParagraph( sal_Int32 nAbsPos ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pParaList->GetParagraph( nAbsPos );
 }
 
 sal_Bool Outliner::HasChildren( Paragraph* pParagraph ) const
 {
-    DBG_CHKTHIS(Outliner,0);
     return pParaList->HasChildren( pParagraph );
 }
 
@@ -1545,7 +1502,6 @@ Size Outliner::ImplGetBulletSize( sal_Int32 nPara )
 
 void Outliner::ImplCheckParagraphs( sal_Int32 nStart, sal_Int32 nEnd )
 {
-    DBG_CHKTHIS( Outliner, 0 );
 
     for ( sal_Int32 n = nStart; n < nEnd; n++ )
     {
@@ -1560,7 +1516,6 @@ void Outliner::ImplCheckParagraphs( sal_Int32 nStart, sal_Int32 nEnd )
 
 void Outliner::SetRefDevice( OutputDevice* pRefDev )
 {
-    DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetRefDevice( pRefDev );
     for ( sal_Int32 n = pParaList->GetParagraphCount(); n; )
     {
@@ -1571,7 +1526,6 @@ void Outliner::SetRefDevice( OutputDevice* pRefDev )
 
 void Outliner::ParaAttribsChanged( sal_Int32 nPara )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     // The Outliner does not have an undo of its own, when paragraphs are
     // separated/merged. When ParagraphInserted the attribute EE_PARA_OUTLLEVEL
@@ -1594,7 +1548,6 @@ void Outliner::ParaAttribsChanged( sal_Int32 nPara )
 
 void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     // The EditEngine calls StyleSheetChanged also for derived styles.
     // Here all the paragraphs, which had the said template, used to be
@@ -1718,7 +1671,6 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, sal_Bool bAdjust, sal_Bo
 
 void Outliner::ExpandHdl()
 {
-    DBG_CHKTHIS(Outliner,0);
     aExpandHdl.Call( this );
 }
 
@@ -1757,7 +1709,6 @@ EBulletInfo Outliner::GetBulletInfo( sal_Int32 nPara )
 
 OUString Outliner::GetText( Paragraph* pParagraph, sal_Int32 nCount ) const
 {
-    DBG_CHKTHIS(Outliner,0);
 
     OUString aText;
     sal_Int32 nStartPara = pParaList->GetAbsPos( pParagraph );
@@ -1772,7 +1723,6 @@ OUString Outliner::GetText( Paragraph* pParagraph, sal_Int32 nCount ) const
 
 void Outliner::Remove( Paragraph* pPara, sal_Int32 nParaCount )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     sal_Int32 nPos = pParaList->GetAbsPos( pPara );
     if( !nPos && ( nParaCount >= pParaList->GetParagraphCount() ) )
@@ -1788,7 +1738,6 @@ void Outliner::Remove( Paragraph* pPara, sal_Int32 nParaCount )
 
 void Outliner::StripPortions()
 {
-    DBG_CHKTHIS(Outliner,0);
     bStrippingPortions = sal_True;
     pEditEngine->StripPortions();
     bStrippingPortions = sal_False;
@@ -1805,7 +1754,6 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_u
     const Color& rOverlineColor,
     const Color& rTextLineColor)
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if(aDrawPortionHdl.IsSet())
     {
@@ -1831,13 +1779,11 @@ void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const OUString&
 
 long Outliner::RemovingPagesHdl( OutlinerView* pView )
 {
-    DBG_CHKTHIS(Outliner,0);
     return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : sal_True;
 }
 
 sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 _nFirstPage, sal_Int32 nPages )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     nDepthChangedHdlPrevDepth = nPages;
     mnFirstSelPage = _nFirstPage;
@@ -1847,13 +1793,11 @@ sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32
 
 SfxItemSet Outliner::GetParaAttribs( sal_Int32 nPara )
 {
-    DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetParaAttribs( nPara );
 }
 
 IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     sal_Int32 nPara = pParaList->GetAbsPos( pPara );
     pEditEngine->ShowParagraph( nPara, pPara->IsVisible() );
@@ -1863,7 +1807,6 @@ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara )
 
 IMPL_LINK_NOARG(Outliner, BeginMovingParagraphsHdl)
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if( !IsInUndo() )
         GetBeginMovingHdl().Call( this );
@@ -1889,7 +1832,6 @@ IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos )
 
 IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     pParaList->MoveParagraphs( pInfos->nStartPara, pInfos->nDestPara, pInfos->nEndPara - pInfos->nStartPara + 1 );
     sal_Int32 nChangesStart = std::min( pInfos->nStartPara, pInfos->nDestPara );
@@ -1973,7 +1915,6 @@ sal_uInt16 Outliner::ImplGetNumbering( sal_Int32 nPara, const SvxNumberFormat* p
 
 void Outliner::ImplCalcBulletText( sal_Int32 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChildren )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     Paragraph* pPara = pParaList->GetParagraph( nPara );
 
@@ -2022,7 +1963,6 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, sal_Bool bRecalcLevel, sal_B
 
 void Outliner::Clear()
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if( !bFirstParaIsEmpty )
     {
@@ -2043,7 +1983,6 @@ void Outliner::Clear()
 
 void Outliner::SetFlatMode( sal_Bool bFlat )
 {
-    DBG_CHKTHIS(Outliner,0);
 
     if( bFlat != pEditEngine->IsFlatMode() )
     {
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index dcd41e2539cb..d7f155df5aa2 100644
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -149,12 +149,10 @@ void OutlinerUndoCheckPara::Repeat()
     OSL_FAIL( "Repeat not implemented!" );
 }
 
-DBG_NAME(OLUndoExpand);
 
 OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId )
     : EditUndo( _nId, 0 )
 {
-    DBG_CTOR(OLUndoExpand,0);
     DBG_ASSERT(pOut,"Undo:No Outliner");
     pOutliner = pOut;
     nCount = 0;
@@ -164,14 +162,12 @@ OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId )
 
 OLUndoExpand::~OLUndoExpand()
 {
-    DBG_DTOR(OLUndoExpand,0);
     delete pParas;
 }
 
 
 void OLUndoExpand::Restore( sal_Bool bUndo )
 {
-    DBG_CHKTHIS(OLUndoExpand,0);
     DBG_ASSERT(pOutliner,"Undo:No Outliner");
     DBG_ASSERT(pOutliner->pEditEngine,"Outliner already deleted");
     Paragraph* pPara;
@@ -204,21 +200,18 @@ void OLUndoExpand::Restore( sal_Bool bUndo )
 
 void OLUndoExpand::Undo()
 {
-    DBG_CHKTHIS(OLUndoExpand,0);
     Restore( sal_True );
 }
 
 
 void OLUndoExpand::Redo()
 {
-    DBG_CHKTHIS(OLUndoExpand,0);
     Restore( sal_False );
 }
 
 
 void OLUndoExpand::Repeat()
 {
-    DBG_CHKTHIS(OLUndoExpand,0);
     OSL_FAIL("Not implemented");
 }
 
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 036b4642a545..ef7773110ead 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -46,12 +46,10 @@
 
 using namespace ::com::sun::star;
 
-DBG_NAME(OutlinerView)
 
 
 OutlinerView::OutlinerView( Outliner* pOut, Window* pWin )
 {
-    DBG_CTOR( OutlinerView, 0 );
 
     pOwner                      = pOut;
 
@@ -61,14 +59,11 @@ OutlinerView::OutlinerView( Outliner* pOut, Window* pWin )
 
 OutlinerView::~OutlinerView()
 {
-    DBG_DTOR(OutlinerView,0);
     delete pEditView;
 }
 
 void OutlinerView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
 {
-    DBG_CHKTHIS(OutlinerView,0);
-
     // For the first Paint/KeyInput/Drop an emty Outliner is turned into
     // an Outliner with exactly one paragraph.
     if( pOwner->bFirstParaIsEmpty )
@@ -79,14 +74,11 @@ void OutlinerView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
 
 sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
-
     // For the first Paint/KeyInput/Drop an emty Outliner is turned into
     // an Outliner with exactly one paragraph.
     if( pOwner->bFirstParaIsEmpty )
         pOwner->Insert( OUString() );
 
-
     sal_Bool bKeyProcessed = sal_False;
     ESelection aSel( pEditView->GetSelection() );
     sal_Bool bSelection = aSel.HasRange();
@@ -247,13 +239,10 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
     }
 
     return bKeyProcessed ? sal_True : pEditView->PostKeyEvent( rKEvt, pFrameWin );
-
 }
 
-
 sal_Int32 OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget)
 {
-    DBG_CHKTHIS(OutlinerView,0);
     sal_Int32 nPara = EE_PARA_NOT_FOUND;
 
     Point aMousePosWin = pEditView->GetWindow()->PixelToLogic( rPosPix );
@@ -297,8 +286,6 @@ sal_Int32 OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTa
 
 sal_Bool OutlinerView::MouseMove( const MouseEvent& rMEvt )
 {
-    DBG_CHKTHIS(OutlinerView,0);
-
     if( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode())
         return pEditView->MouseMove( rMEvt );
 
@@ -314,7 +301,6 @@ sal_Bool OutlinerView::MouseMove( const MouseEvent& rMEvt )
 
 sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
         return pEditView->MouseButtonDown( rMEvt );
 
@@ -363,7 +349,6 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 
 sal_Bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
         return pEditView->MouseButtonUp( rMEvt );
 
@@ -379,8 +364,6 @@ sal_Bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
 
 void OutlinerView::ImpToggleExpand( Paragraph* pPara )
 {
-    DBG_CHKTHIS(OutlinerView,0);
-
     sal_Int32 nPara = pOwner->pParaList->GetAbsPos( pPara );
     pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) );
     ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChildren( pPara ) );
@@ -390,8 +373,6 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
 sal_Int32 OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
     sal_Bool bWithChildren )
 {
-    DBG_CHKTHIS(OutlinerView,0);
-
     sal_Int32 nPara = pOwner->pParaList->GetAbsPos( pParagraph );
     sal_uInt16 nEnd = 0;
     if ( bSelect )
@@ -409,8 +390,6 @@ sal_Int32 OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
 
 void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
 {
-    DBG_CHKTHIS(OutlinerView,0);
-
     sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
     pOwner->pEditEngine->SetUpdateMode( sal_False );
 
@@ -439,8 +418,6 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
 
 ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChildren )
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
-
     ESelection aSel = pEditView->GetSelection();
     ParaRange aParas( aSel.nStartPara, aSel.nEndPara );
     aParas.Adjust();
@@ -463,8 +440,6 @@ void OutlinerView::AdjustDepth( short nDX )
 
 void OutlinerView::Indent( short nDiff )
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
-
     if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( sal_True ) && !pOwner->ImpCanIndentSelectedPages( this ) ) )
         return;
 
@@ -598,20 +573,17 @@ void OutlinerView::Indent( short nDiff )
 
 sal_Bool OutlinerView::AdjustHeight( long nDY )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->MoveParagraphs( nDY );
     return sal_True;    // remove return value...
 }
 
 Rectangle OutlinerView::GetVisArea() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetVisArea();
 }
 
 void OutlinerView::Expand()
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
     ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
     ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_True );
 }
@@ -619,7 +591,6 @@ void OutlinerView::Expand()
 
 void OutlinerView::Collapse()
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
     ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
     ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_False );
 }
@@ -627,21 +598,17 @@ void OutlinerView::Collapse()
 
 void OutlinerView::ExpandAll()
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
     ImplExpandOrCollaps( 0, pOwner->pParaList->GetParagraphCount()-1, sal_True );
 }
 
 
 void OutlinerView::CollapseAll()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     ImplExpandOrCollaps( 0, pOwner->pParaList->GetParagraphCount()-1, sal_False );
 }
 
 void OutlinerView::ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara, sal_Bool bExpand )
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
-
     sal_Bool bUpdate = pOwner->GetUpdateMode();
     pOwner->SetUpdateMode( sal_False );
 
@@ -681,8 +648,6 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
     // Possibly problematic:
     // EditEngine, RTF => Splitting the area, later join together.
 
-    DBG_CHKTHIS(OutlinerView,0);
-
     if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
         return;
 
@@ -705,20 +670,17 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
 
 void OutlinerView::Cut()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
         pEditView->Cut();
 }
 
 void OutlinerView::Paste()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     PasteSpecial(); // HACK(SD does not call PasteSpecial)
 }
 
 void OutlinerView::PasteSpecial()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
     {
         pOwner->UndoActionStart( OLUNDO_INSERT );
@@ -743,8 +705,6 @@ void OutlinerView::PasteSpecial()
 
 void OutlinerView::CreateSelectionList (std::vector<Paragraph*> &aSelList)
 {
-    DBG_CHKTHIS( OutlinerView, 0 );
-
     ParaRange aParas = ImpGetSelectedParagraphs( sal_True );
 
     for ( sal_Int32 nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ )
@@ -756,20 +716,16 @@ void OutlinerView::CreateSelectionList (std::vector<Paragraph*> &aSelList)
 
 const SfxStyleSheet* OutlinerView::GetStyleSheet() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetStyleSheet();
 }
 
 SfxStyleSheet* OutlinerView::GetStyleSheet()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetStyleSheet();
 }
 
 Pointer OutlinerView::GetPointer( const Point& rPosPixel )
 {
-    DBG_CHKTHIS(OutlinerView,0);
-
     MouseTarget eTarget;
     ImpCheckMousePos( rPosPixel, eTarget );
 
@@ -793,7 +749,6 @@ Pointer OutlinerView::GetPointer( const Point& rPosPixel )
 
 sal_Int32 OutlinerView::ImpInitPaste( sal_Int32& rStart )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pOwner->bPasting = sal_True;
     ESelection aSelection( pEditView->GetSelection() );
     aSelection.Adjust();
@@ -805,7 +760,6 @@ sal_Int32 OutlinerView::ImpInitPaste( sal_Int32& rStart )
 
 void OutlinerView::ImpPasted( sal_Int32 nStart, sal_Int32 nPrevParaCount, sal_Int32 nSize)
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pOwner->bPasting = sal_False;
     sal_Int32 nCurParaCount = pOwner->pEditEngine->GetParagraphCount();
     if( nCurParaCount < nPrevParaCount )
@@ -818,14 +772,12 @@ void OutlinerView::ImpPasted( sal_Int32 nStart, sal_Int32 nPrevParaCount, sal_In
 
 void OutlinerView::Command( const CommandEvent& rCEvt )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->Command( rCEvt );
 }
 
 
 void OutlinerView::SelectRange( sal_Int32 nFirst, sal_Int32 nCount )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     sal_Int32 nLast = nFirst+nCount;
     nCount = pOwner->pParaList->GetParagraphCount();
     if( nLast <= nCount )
@@ -837,8 +789,6 @@ void OutlinerView::SelectRange( sal_Int32 nFirst, sal_Int32 nCount )
 
 sal_Int32 OutlinerView::ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected )
 {
-    DBG_CHKTHIS(OutlinerView,0);
-
     ESelection aSel( pEditView->GetSelection() );
     aSel.Adjust();
 
@@ -1211,7 +1161,6 @@ void OutlinerView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
 
 void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich, sal_Bool bKeepLanguages )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     sal_Bool bUpdate = pOwner->GetUpdateMode();
     pOwner->SetUpdateMode( sal_False );
     pOwner->UndoActionStart( OLUNDO_ATTR );
@@ -1243,7 +1192,6 @@ void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich
 
 void OutlinerView::InsertText( const OUString& rNew, sal_Bool bSelect )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     if( pOwner->bFirstParaIsEmpty )
         pOwner->Insert( OUString() );
     pEditView->InsertText( rNew, bSelect );
@@ -1251,102 +1199,79 @@ void OutlinerView::InsertText( const OUString& rNew, sal_Bool bSelect )
 
 void OutlinerView::SetVisArea( const Rectangle& rRect )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetVisArea( rRect );
 }
 
 
 void OutlinerView::SetSelection( const ESelection& rSel )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetSelection( rSel );
 }
 
 void OutlinerView::SetReadOnly( sal_Bool bReadOnly )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetReadOnly( bReadOnly );
 }
 
 sal_Bool OutlinerView::IsReadOnly() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsReadOnly();
 }
 
 sal_Bool OutlinerView::HasSelection() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->HasSelection();
 }
 
-
 void OutlinerView::ShowCursor( sal_Bool bGotoCursor )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->ShowCursor( bGotoCursor );
 }
 
-
 void OutlinerView::HideCursor()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->HideCursor();
 }
 
-
 void OutlinerView::SetWindow( Window* pWin )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetWindow( pWin );
 }
 
-
 Window* OutlinerView::GetWindow() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetWindow();
 }
 
-
 void OutlinerView::SetOutputArea( const Rectangle& rRect )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetOutputArea( rRect );
 }
 
-
 Rectangle OutlinerView::GetOutputArea() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetOutputArea();
 }
 
-
 OUString OutlinerView::GetSelected() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSelected();
 }
 
 EESpellState OutlinerView::StartSpeller( sal_Bool bMultiDoc )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->StartSpeller( bMultiDoc );
 }
 
 EESpellState OutlinerView::StartThesaurus()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->StartThesaurus();
 }
 
-
 void OutlinerView::StartTextConversion(
     LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
     sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     if (
         (LANGUAGE_KOREAN == nSrcLang && LANGUAGE_KOREAN == nDestLang) ||
         (LANGUAGE_CHINESE_SIMPLIFIED  == nSrcLang && LANGUAGE_CHINESE_TRADITIONAL == nDestLang) ||
@@ -1364,120 +1289,95 @@ void OutlinerView::StartTextConversion(
 
 sal_uInt16 OutlinerView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->StartSearchAndReplace( rSearchItem );
 }
 
 void OutlinerView::TransliterateText( sal_Int32 nTransliterationMode )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->TransliterateText( nTransliterationMode );
 }
 
-
-
 ESelection OutlinerView::GetSelection()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSelection();
 }
 
 
 void OutlinerView::Scroll( long nHorzScroll, long nVertScroll )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->Scroll( nHorzScroll, nVertScroll );
 }
 
-
 void OutlinerView::SetControlWord( sal_uLong nWord )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetControlWord( nWord );
 }
 
-
 sal_uLong OutlinerView::GetControlWord() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetControlWord();
 }
 
-
 void OutlinerView::SetAnchorMode( EVAnchorMode eMode )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetAnchorMode( eMode );
 }
 
-
 EVAnchorMode OutlinerView::GetAnchorMode() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetAnchorMode();
 }
 
 void OutlinerView::Copy()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->Copy();
 }
 
-
 void OutlinerView::InsertField( const SvxFieldItem& rFld )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->InsertField( rFld );
 }
 
 const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetFieldUnderMousePointer();
 }
 
 const SvxFieldItem* OutlinerView::GetFieldAtSelection() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetFieldAtSelection();
 }
 
 void OutlinerView::SetInvalidateMore( sal_uInt16 nPixel )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetInvalidateMore( nPixel );
 }
 
 
 sal_uInt16 OutlinerView::GetInvalidateMore() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetInvalidateMore();
 }
 
 
 sal_Bool OutlinerView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsCursorAtWrongSpelledWord( bMarkIfWrong );
 }
 
 
 sal_Bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong );
 }
 
 void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg );
 }
 
 sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     sal_Int32 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
     ESelection aOldSel = pEditView->GetSelection();
     aOldSel.Adjust();
@@ -1512,38 +1412,32 @@ sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EEText
 
 void OutlinerView::SetBackgroundColor( const Color& rColor )
 {
-    DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetBackgroundColor( rColor );
 }
 
 
 Color OutlinerView::GetBackgroundColor()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetBackgroundColor();
 }
 
 SfxItemSet OutlinerView::GetAttribs()
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetAttribs();
 }
 
 sal_uInt16 OutlinerView::GetSelectedScriptType() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSelectedScriptType();
 }
 
 OUString OutlinerView::GetSurroundingText() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSurroundingText();
 }
 
 Selection OutlinerView::GetSurroundingTextSelection() const
 {
-    DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSurroundingTextSelection();
 }
 
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index bcc8a9366622..ff5e38060c80 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -26,8 +26,6 @@
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 
-DBG_NAME(Paragraph)
-
 ParagraphData::ParagraphData()
 : nDepth( -1 )
 , mnNumberingStartValue( -1 )
@@ -60,7 +58,6 @@ bool ParagraphData::operator==(const ParagraphData& rCandidate) const
 Paragraph::Paragraph( sal_Int16 nDDepth )
 : aBulSize( -1, -1)
 {
-    DBG_CTOR( Paragraph, 0 );
 
     DBG_ASSERT(  ( nDDepth >= -1 ) && ( nDDepth < SVX_MAX_NUM ), "Paragraph-CTOR: nDepth invalid!" );
 
@@ -74,7 +71,6 @@ Paragraph::Paragraph( const Paragraph& rPara )
 , aBulText( rPara.aBulText )
 , aBulSize( rPara.aBulSize )
 {
-    DBG_CTOR( Paragraph, 0 );
 
     nDepth = rPara.nDepth;
     nFlags = rPara.nFlags;
@@ -86,8 +82,6 @@ Paragraph::Paragraph( const ParagraphData& rData )
 , aBulSize( -1, -1)
 , bVisible( sal_True )
 {
-    DBG_CTOR( Paragraph, 0 );
-
     nDepth = rData.nDepth;
     mnNumberingStartValue = rData.mnNumberingStartValue;
     mbParaIsNumberingRestart = rData.mbParaIsNumberingRestart;
@@ -95,7 +89,6 @@ Paragraph::Paragraph( const ParagraphData& rData )
 
 Paragraph::~Paragraph()
 {
-    DBG_DTOR( Paragraph, 0 );
 }
 
 void Paragraph::SetNumberingStartValue( sal_Int16 nNumberingStartValue )