SFX2 : Remove usage of DBG_CTOR and DBG_DTOR.

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

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

19 files changed, 0 insertions, 94 deletions

diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 74c753476ad8..9058a841a638 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -161,7 +161,6 @@ SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId)
     pImp->pWorkWin = NULL;
 
     pContext = 0L;
-    DBG_CTOR(SfxChildWindow,0);
 }
 
 void SfxChildWindow::Destroy()
@@ -188,7 +187,6 @@ void SfxChildWindow::Destroy()
 
 SfxChildWindow::~SfxChildWindow()
 {
-    DBG_DTOR(SfxChildWindow,0);
     delete pContext;
     delete pWindow;
     delete pImp;
@@ -311,7 +309,6 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
 
 void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign)
 {
-    DBG_CHKTHIS(SfxChildWindow,0);
 
     eChildAlignment = eAlign;
 }
@@ -319,7 +316,6 @@ void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign)
 
 SfxChildWinInfo SfxChildWindow::GetInfo() const
 {
-    DBG_CHKTHIS(SfxChildWindow,0);
 
     SfxChildWinInfo aInfo(pImp->pFact->aInfo);
     aInfo.aPos  = pWindow->GetPosPixel();
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index fbba20c3066c..e50be8e6894a 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -607,7 +607,6 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
     m_aTbxTypeName( "private:resource/toolbar/" ),
     m_aProgressBarResName( "private:resource/progressbar/progressbar" )
 {
-    DBG_CTOR(SfxWorkWindow, 0);
     DBG_ASSERT (pBindings, "No Bindings!");
 
     pBindings->SetWorkWindow_Impl( this );
@@ -630,7 +629,6 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
 
 SfxWorkWindow::~SfxWorkWindow()
 {
-    DBG_DTOR(SfxWorkWindow, 0);
 
     // Delete SplitWindows
     for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
@@ -672,7 +670,6 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
 
 void SfxWorkWindow::DeleteControllers_Impl()
 {
-    DBG_CHKTHIS(SfxWorkWindow, 0);
 
     // Lock SplitWindows (which means supressing the Resize-Reaction of the
     // DockingWindows)
@@ -813,7 +810,6 @@ SvBorder SfxWorkWindow::Arrange_Impl()
     ClientArea, it is set to "not visible".
 */
 {
-    DBG_CHKTHIS(SfxWorkWindow, 0);
 
     aClientArea = GetTopRect_Impl();
     aUpperClientArea = aClientArea;
@@ -972,7 +968,6 @@ sal_Bool SfxWorkWindow::PrepareClose_Impl()
 SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
                     SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
 {
-    DBG_CHKTHIS(SfxWorkWindow, 0);
     DBG_ASSERT( aChildren.size() < 255, "too many children" );
     DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
     DBG_ASSERT( !FindChild_Impl(rWindow), "child registered more than once" );
@@ -995,7 +990,6 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
 
 void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 {
-    DBG_CHKTHIS(SfxWorkWindow, 0);
 
     SfxChild_Impl *pChild = 0;
     sal_uInt16 nPos;
@@ -1022,7 +1016,6 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 
 SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
 {
-    DBG_CHKTHIS(SfxWorkWindow, 0);
 
     SfxChild_Impl *pChild = 0;
     sal_uInt16 nCount = aChildren.size();
@@ -1040,7 +1033,6 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
 
 void SfxWorkWindow::ShowChildren_Impl()
 {
-    DBG_CHKTHIS(SfxWorkWindow, 0);
 
     bool bInvisible = ( !IsVisible_Impl() || ( !pWorkWin->IsReallyVisible() && !pWorkWin->IsReallyShown() ));
 
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 2f3cf6f80670..f0d05e9f9653 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -57,7 +57,6 @@ void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType )
 
 SfxControllerItem* SfxControllerItem::GetItemLink()
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     return pNext == this ? 0 : pNext;
 }
 
@@ -66,7 +65,6 @@ SfxControllerItem* SfxControllerItem::GetItemLink()
 
 sal_Bool SfxControllerItem::IsBound() const
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     return pNext != this;
 }
 
@@ -75,7 +73,6 @@ sal_Bool SfxControllerItem::IsBound() const
 
 void SfxControllerItem::Bind( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings || pBindinx, "No Bindings");
 
     if ( IsBound() ) {
@@ -93,7 +90,6 @@ void SfxControllerItem::Bind( sal_uInt16 nNewId, SfxBindings *pBindinx )
 
 void SfxControllerItem::BindInternal_Impl( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings || pBindinx, "No Bindings");
 
     if ( IsBound() ) {
@@ -127,7 +123,6 @@ void SfxControllerItem::UnBind()
     <SfxControllerItem::ClearCache()>
 */
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings, "No Bindings");
     DBG_ASSERT( IsBound(), "unbindings unbound SfxControllerItem" );
 
@@ -152,7 +147,6 @@ void SfxControllerItem::ReBind()
 */
 
 {
-DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings, "No Bindings");
     DBG_ASSERT( !IsBound(), "bindings rebound SfxControllerItem" );
 
@@ -184,7 +178,6 @@ void SfxControllerItem::ClearCache()
 
 
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings, "No Bindings");
 
     pBindings->ClearCache_Impl( GetId() );
@@ -195,7 +188,6 @@ void SfxControllerItem::ClearCache()
 
 SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLink )
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     SfxControllerItem* pOldLink = pNext;
     pNext = pNewLink;
     return pOldLink == this ? 0 : pOldLink;
@@ -206,7 +198,6 @@ SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLin
 
 void SfxControllerItem::SetId( sal_uInt16 nItemId )
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT( !IsBound(), "changing id of bound binding" );
     nId = nItemId;
 }
@@ -220,7 +211,6 @@ SfxControllerItem::SfxControllerItem():
     pNext(this),
     pBindings(0)
 {
-    DBG_CTOR(SfxControllerItem, 0);
 }
 
 
@@ -231,7 +221,6 @@ SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ):
     pNext(this),
     pBindings(&rBindings)
 {
-    DBG_CTOR(SfxControllerItem, 0);
     Bind(nId, &rBindings);
 }
 
@@ -242,7 +231,6 @@ SfxControllerItem::~SfxControllerItem()
 {
     if ( IsBound() )
         pBindings->Release(*this);
-    DBG_DTOR(SfxControllerItem, 0);
 }
 
 
@@ -275,14 +263,12 @@ void SfxControllerItem::StateChanged
 */
 
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
 }
 
 
 
 void SfxControllerItem::DeleteFloatingWindow()
 {
-    DBG_CHKTHIS(SfxControllerItem, 0);
 }
 
 
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 2be61cec80f2..a0308ca2d053 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -309,7 +309,6 @@ SfxInterface::~SfxInterface()
 
 const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const
 {
-    DBG_CHKTHIS(SfxInterface, 0);
 
     assert( pSlots );
     assert( nCount );
@@ -345,7 +344,6 @@ const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const
 
 const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
 {
-    DBG_CHKTHIS(SfxInterface, 0);
 
     assert( pSlots );
     assert( nCount );
@@ -365,7 +363,6 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
 
 const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
 {
-    DBG_CHKTHIS(SfxInterface, 0);
 
     assert( pSlots );
     assert( nCount );
@@ -386,7 +383,6 @@ const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
 
 void SfxInterface::RegisterPopupMenu( const ResId& rResId )
 {
-    DBG_CHKTHIS(SfxInterface, 0);
 
     pImpData->aPopupRes = rResId;
 }
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 77ea0648025a..30e8fb1dea59 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -130,7 +130,6 @@ SfxShell::SfxShell()
     pPool(0),
     pUndoMgr(0)
 {
-    DBG_CTOR(SfxShell, 0);
     pImp = new SfxShell_Impl;
     pImp->pViewSh = 0;
     pImp->pFrame = 0;
@@ -156,7 +155,6 @@ SfxShell::SfxShell( SfxViewShell *pViewSh )
     pPool(0),
     pUndoMgr(0)
 {
-    DBG_CTOR(SfxShell, 0);
     pImp = new SfxShell_Impl;
     pImp->pViewSh = pViewSh;
     pImp->pFrame = 0;
@@ -178,7 +176,6 @@ SfxShell::~SfxShell()
 */
 
 {
-    DBG_DTOR(SfxShell, 0);
 
 
     delete pImp;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 10247d78a64c..129e94f7373f 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -196,7 +196,6 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ):
     eLastState( 0 ),
     bItemVisible( sal_True )
 {
-    DBG_CTOR(SfxStateCache, 0);
     bCtrlDirty = sal_True;
     bSlotDirty = sal_True;
     bItemDirty = sal_True;
@@ -207,7 +206,6 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ):
 
 SfxStateCache::~SfxStateCache()
 {
-    DBG_DTOR(SfxStateCache, 0);
     DBG_ASSERT( pController == 0 && pInternalController == 0, "there are still Controllers registered" );
     if ( !IsInvalidItem(pLastItem) )
         delete pLastItem;
@@ -240,7 +238,6 @@ void SfxStateCache::Invalidate( sal_Bool bWithMsg )
 
 const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & xProv )
 {
-    DBG_CHKTHIS(SfxStateCache, 0);
 
     if ( bSlotDirty )
     {
@@ -407,7 +404,6 @@ void SfxStateCache::SetState_Impl
 )
 {
     (void)bMaybeDirty; //unused
-    DBG_CHKTHIS(SfxStateCache, 0);
 
     // If a hard update occurs between enter- and leave-registrations is a
     // can also intermediate Cached exist without controller.
@@ -467,7 +463,6 @@ void SfxStateCache::SetState_Impl
 
 void SfxStateCache::SetCachedState( sal_Bool bAlways )
 {
-    DBG_CHKTHIS(SfxStateCache, 0);
     DBG_ASSERT(pController==NULL||pController->GetId()==nId, "Cache with wrong ControllerItem" );
     DBG_PROFSTART(SfxStateCacheSetState);
 
@@ -501,7 +496,6 @@ void SfxStateCache::SetCachedState( sal_Bool bAlways )
 
 void SfxStateCache::DeleteFloatingWindows()
 {
-    DBG_CHKTHIS(SfxStateCache, 0);
 
     SfxControllerItem *pNextCtrl=0;
     for ( SfxControllerItem *pCtrl=pController; pCtrl; pCtrl=pNextCtrl )
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 6839cbfd9fc2..d88990951097 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -104,7 +104,6 @@ SfxObjectFactory::SfxObjectFactory
        pImpl( new SfxObjectFactory_Impl ),
        nFlags( nFlagsP )
 {
-    DBG_CTOR(SfxObjectFactory, 0);
     pImpl->pFilterContainer = new SfxFilterContainer( OUString::createFromAscii( pName ) );
 
     OUString aShortName( OUString::createFromAscii( pShortName ) );
@@ -130,7 +129,6 @@ SfxObjectFactory::SfxObjectFactory
 
 SfxObjectFactory::~SfxObjectFactory()
 {
-    DBG_DTOR(SfxObjectFactory, 0);
 
     delete pImpl->pNameResId;
     delete pImpl->pFilterContainer;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index f03a54c14a4e..2d1440d81a99 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -54,14 +54,12 @@ SfxFrameDescriptor::SfxFrameDescriptor() :
     bHasUI( sal_True ),
     bReadOnly( sal_False )
 {
-    DBG_CTOR(SfxFrameDescriptor, 0);
 
     pImp = new SfxFrameDescriptor_Impl;
 }
 
 SfxFrameDescriptor::~SfxFrameDescriptor()
 {
-    DBG_DTOR(SfxFrameDescriptor, 0);
     delete pImp;
 }
 
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a463bf5a8946..f520802c1e8b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -354,7 +354,6 @@ void SfxObjectShell::ModifyChanged()
         // SetModified dispose of the models!
         return;
 
-    {DBG_CHKTHIS(SfxObjectShell, 0);}
 
     SfxViewFrame* pViewFrame = SfxViewFrame::Current();
     if ( pViewFrame )
@@ -715,7 +714,6 @@ void SfxObjectShell::SetTitle
 */
 
 {
-    DBG_CHKTHIS(SfxObjectShell, 0);
 
     // Nothing to do?
     if ( ( ( HasName() && pImp->aTitle == rTitle )
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 6de6e06a8d48..8ab06d0ad4c9 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -292,7 +292,6 @@ sal_Bool SfxObjectShell::APISaveAs_Impl
 {
     sal_Bool bOk = sal_False;
 
-    {DBG_CHKTHIS(SfxObjectShell, 0);}
 
     if ( GetMedium() )
     {
@@ -425,7 +424,6 @@ uno::Sequence< document::CmisVersion > SfxObjectShell::GetCmisVersions( )
 
 void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 {
-    {DBG_CHKTHIS(SfxObjectShell, 0);}
 
     sal_uInt16 nId = rReq.GetSlot();
 
@@ -930,7 +928,6 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 
 void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
 {
-    DBG_CHKTHIS(SfxObjectShell, 0);
     SfxWhichIter aIter( rSet );
 
     for ( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index cb6e5241698a..965297c96112 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2569,7 +2569,6 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet )
         return sal_False;
     }
 
-    DBG_CHKTHIS(SfxObjectShell, 0);
 
     pImp->bIsSaving = sal_True;
     sal_Bool bSaved = sal_False;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 262dabd41c1a..4b2a7ad765d9 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -294,7 +294,6 @@ SfxObjectShell::SfxObjectShell( const sal_uInt64 i_nCreationFlags )
     ,   bHasName( sal_False )
     ,   bIsInGenerateThumbnail ( sal_False )
 {
-    DBG_CTOR(SfxObjectShell, 0);
 
     const bool bScriptSupport = ( i_nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0;
     if ( !bScriptSupport )
@@ -342,7 +341,6 @@ SfxObjectShell::SfxObjectShell
     bHasName( sal_False ),
     bIsInGenerateThumbnail ( sal_False )
 {
-    DBG_CTOR(SfxObjectShell, 0);
 }
 
 
@@ -351,7 +349,6 @@ SfxObjectShell::SfxObjectShell
 
 SfxObjectShell::~SfxObjectShell()
 {
-    DBG_DTOR(SfxObjectShell, 0);
 
     if ( IsEnableSetModified() )
         EnableSetModified( sal_False );
@@ -441,7 +438,6 @@ void SfxObjectShell::ViewAssigned()
 
 bool SfxObjectShell::Close()
 {
-    {DBG_CHKTHIS(SfxObjectShell, 0);}
     SfxObjectShellRef aRef(this);
     if ( !pImp->bClosing )
     {
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 7a30ba3e1a21..78d26f556885 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -523,7 +523,6 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
 , m_bSupportEmbeddedScripts( pObjectShell && pObjectShell->Get_Impl() ? !pObjectShell->Get_Impl()->m_bNoBasicCapabilities : false )
 , m_bSupportDocRecovery( pObjectShell && pObjectShell->Get_Impl() ? pObjectShell->Get_Impl()->m_bDocRecoverySupport : false )
 {
-    DBG_CTOR(sfx2_SfxBaseModel,NULL);
     if ( pObjectShell != NULL )
     {
         StartListening( *pObjectShell ) ;
@@ -536,7 +535,6 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
 
 SfxBaseModel::~SfxBaseModel()
 {
-    DBG_DTOR(sfx2_SfxBaseModel,NULL);
 }
 
 
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 9309f6b94884..d2a1d81a5854 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -179,7 +179,6 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId,
     bHelpInitialized( bWithHelp ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
-    DBG_CTOR(SfxVirtualMenu, 0);
     pSVMenu = &rMenu;
 
     bResCtor = bRes;
@@ -212,7 +211,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
     bHelpInitialized( bWithHelp ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
-    DBG_CTOR(SfxVirtualMenu, 0);
 
     pSVMenu = pStarViewMenu;
 
@@ -241,7 +239,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
 
 SfxVirtualMenu::~SfxVirtualMenu()
 {
-    DBG_DTOR(SfxVirtualMenu, 0);
 
     DELETEZ( pImageControl );
     SvtMenuOptions().RemoveListenerLink( LINK( this, SfxVirtualMenu, SettingsChanged ) );
@@ -288,7 +285,6 @@ SfxVirtualMenu::~SfxVirtualMenu()
 
 void SfxVirtualMenu::CreateFromSVMenu()
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     // Merge Addon popup menus into the SV Menu
     SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
@@ -495,7 +491,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
 IMPL_LINK_NOARG( SfxVirtualMenu, Highlight )
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     return sal_True;
 }
@@ -787,7 +782,6 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
 
 IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_OUTF( ("SfxVirtualMenu %lx activated %lx, own %lx", this, pMenu, pSVMenu));
 
     // MI: for what was it still good for?
@@ -986,7 +980,6 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
 
 Menu* SfxVirtualMenu::GetSVMenu() const
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     return pSVMenu;
 }
@@ -997,7 +990,6 @@ Menu* SfxVirtualMenu::GetSVMenu() const
 
 void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_ASSERT( this != 0, "");
     DBG_ASSERT( pSVMenu != 0, "" );
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
@@ -1009,7 +1001,6 @@ void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
 
 void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_ASSERT( this != 0, "");
     DBG_ASSERT( pSVMenu != 0, "" );
 
@@ -1022,7 +1013,6 @@ void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
 
 void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const OUString& rText )
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_ASSERT( this != 0, "");
     DBG_ASSERT( pSVMenu != 0, "" );
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
@@ -1034,7 +1024,6 @@ void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const OUString& rText )
 
 void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
         GetSVMenu()->SetPopupMenu( nItemId, pMenu );
@@ -1052,7 +1041,6 @@ void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
 
 void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, sal_Bool /*bOLE*/ )
 {
-    DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
     PopupMenu *pMenu = pSVMenu->GetPopupMenu( nSID );
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 0f5df44af853..259250eef39b 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -475,7 +475,6 @@ DBG_NAME(sfx2_SfxBaseController)
 SfxBaseController::SfxBaseController( SfxViewShell* pViewShell )
     :   m_pData ( new IMPL_SfxBaseController_DataContainer( m_aMutex, pViewShell, this ))
 {
-    DBG_CTOR(sfx2_SfxBaseController,NULL);
     m_pData->m_pViewShell->SetController( this );
 }
 
@@ -485,7 +484,6 @@ SfxBaseController::SfxBaseController( SfxViewShell* pViewShell )
 
 SfxBaseController::~SfxBaseController()
 {
-    DBG_DTOR(sfx2_SfxBaseController,NULL);
     delete m_pData;
 }
 
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 24b5eef7a7ef..04118dabc666 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -27,7 +27,6 @@ DBG_NAME(SfxViewFactory)
 
 SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldSh )
 {
-    DBG_CHKTHIS(SfxViewFactory, 0);
     return (*fnCreate)(pFrame, pOldSh);
 }
 
@@ -58,7 +57,6 @@ SfxViewFactory::SfxViewFactory( SfxViewCtor fnC,
     nOrd(nOrdinal),
     m_sViewName( OUString::createFromAscii( asciiViewName ) )
 {
-    DBG_CTOR(SfxViewFactory, 0);
 }
 
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 1b659b53372c..87a791515c42 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1075,7 +1075,6 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
     <SfxViewFrame::SetObjectShell(SfxObjectShell&)>
 */
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
     DBG_ASSERT( xObjSh.Is(), "no SfxObjectShell to release!" );
 
     GetFrame().ReleasingComponent_Impl( sal_True );
@@ -1130,7 +1129,6 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
 
 sal_Bool SfxViewFrame::Close()
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
 
     DBG_ASSERT( GetFrame().IsClosing_Impl() || !GetFrame().GetFrameInterface().is(), "ViewFrame closed too early!" );
 
@@ -1155,7 +1153,6 @@ sal_Bool SfxViewFrame::Close()
 
 void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame )
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
     SFX_APP();
 
     pDispatcher->DoActivate_Impl( bUI, pOldFrame );
@@ -1177,7 +1174,6 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame )
 
 void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame )
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
     SFX_APP();
     pDispatcher->DoDeactivate_Impl( bUI, pNewFrame );
 
@@ -1269,7 +1265,6 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl
 
 void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
-    {DBG_CHKTHIS(SfxViewFrame, 0);}
 
     if( IsDowning_Impl())
         return;
@@ -1464,7 +1459,6 @@ SfxViewFrame::SfxViewFrame
     , pBindings( new SfxBindings )
     , nAdjustPosPixelLock( 0 )
 {
-    DBG_CTOR( SfxViewFrame, NULL );
 
     rFrame.SetCurrentViewFrame_Impl( this );
     rFrame.SetFrameType_Impl( GetFrameType() | SFXFRAME_HASTITLE );
@@ -1479,7 +1473,6 @@ SfxViewFrame::SfxViewFrame
 
 SfxViewFrame::~SfxViewFrame()
 {
-    DBG_DTOR(SfxViewFrame, 0);
 
     SetDowning_Impl();
 
@@ -1515,7 +1508,6 @@ void SfxViewFrame::KillDispatcher_Impl()
 // Remove and delete the Dispatcher.
 
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
 
     SfxModule* pModule = xObjSh.Is() ? xObjSh->GetModule() : 0;
     if ( xObjSh.Is() )
@@ -1605,7 +1597,6 @@ void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer...
     const Size&     rSize
 )
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
 
     // Components do not use this Method!
     if( pSh && pSh->GetWindow() && !nAdjustPosPixelLock )
@@ -2235,7 +2226,6 @@ void SfxViewFrame::ExecView_Impl
 */
 
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
 
     // If the Shells are just being replaced...
     if ( !GetObjectShell() || !GetViewShell() )
@@ -2394,7 +2384,6 @@ void SfxViewFrame::StateView_Impl
 */
 
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
 
     SfxObjectShell *pDocSh = GetObjectShell();
 
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 1b0e9820f4a0..b77cb7cf4ec2 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -118,7 +118,6 @@ void SfxViewFrame::UpdateTitle()
 */
 
 {
-    DBG_CHKTHIS(SfxViewFrame, 0);
 
     const SfxObjectFactory &rFact = GetObjectShell()->GetFactory();
     pImp->aFactoryName = OUString::createFromAscii(rFact.GetShortName());
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 2b7d94da21df..2caad242dafc 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -782,7 +782,6 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 
 void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
 
     SfxWhichIter aIter( rSet );
     for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
@@ -986,7 +985,6 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
 
 void SfxViewShell::Activate( sal_Bool bMDI )
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
     if ( bMDI )
     {
         SfxObjectShell *pSh = GetViewFrame()->GetObjectShell();
@@ -1001,7 +999,6 @@ void SfxViewShell::Activate( sal_Bool bMDI )
 
 void SfxViewShell::Deactivate(sal_Bool /*bMDI*/)
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
 }
 
 
@@ -1013,7 +1010,6 @@ void SfxViewShell::AdjustPosSizePixel
 )
 
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
 }
 
 
@@ -1085,7 +1081,6 @@ void SfxViewShell::OuterResizePixel
 */
 
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
     SetBorderPixel( SvBorder() );
 }
 
@@ -1136,7 +1131,6 @@ void SfxViewShell::InnerResizePixel
 */
 
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
     SetBorderPixel( SvBorder() );
 }
 
@@ -1144,7 +1138,6 @@ void SfxViewShell::InnerResizePixel
 
 void SfxViewShell::InvalidateBorder()
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
     DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" );
 
     GetViewFrame()->InvalidateBorderImpl( this );
@@ -1158,7 +1151,6 @@ void SfxViewShell::InvalidateBorder()
 
 void SfxViewShell::SetBorderPixel( const SvBorder &rBorder )
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
     DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" );
 
     GetViewFrame()->SetBorderPixelImpl( this, rBorder );
@@ -1174,7 +1166,6 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder )
 
 const SvBorder& SfxViewShell::GetBorderPixel() const
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
     DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" );
 
     return GetViewFrame()->GetBorderPixelImpl( this );
@@ -1239,7 +1230,6 @@ SfxViewShell::SfxViewShell
 ,   pWindow(0)
 ,   bNoNewWindow( 0 != (nFlags & SFX_VIEW_NO_NEWWINDOW) )
 {
-    DBG_CTOR(SfxViewShell, 0);
 
     if ( pViewFrame->GetParentViewFrame() )
     {
@@ -1260,7 +1250,6 @@ SfxViewShell::SfxViewShell
 
 SfxViewShell::~SfxViewShell()
 {
-    DBG_DTOR(SfxViewShell, 0);
 
     // Remove from list
     const SfxViewShell *pThis = this;