Remove cruft in debug tools

21 files changed, 3 insertions, 472 deletions

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index ebb97496004c..e60c1084921f 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -530,8 +530,6 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String
 
 void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
 {
-    DBG_MEMTEST();
-
     SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False);
     String aFactName;
     if ( pFactoryItem )
@@ -565,8 +563,6 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
 
 void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
 {
-    DBG_MEMTEST();
-
     // No Parameter from BASIC only Factory given?
     SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
     SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
@@ -696,8 +692,6 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter)
 
 void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 {
-    DBG_MEMTEST();
-
     sal_uInt16 nSID = rReq.GetSlot();
     SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
     if ( pFileNameItem )
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f6eb9caef52f..3ac312273f34 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -182,7 +182,6 @@ static void showDocument( const char* pBaseName )
 
 void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
-    DBG_MEMTEST();
     bool bDone = false;
     switch ( rReq.GetSlot() )
     {
@@ -616,8 +615,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
 void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 {
-    DBG_MEMTEST();
-
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set without range");
@@ -886,7 +883,6 @@ static ::rtl::OUString getConfigurationStringValue(
 
 void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 {
-    DBG_MEMTEST();
     switch ( rReq.GetSlot() )
     {
         case SID_OPTIONS_TREEDIALOG:
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 3c7bf60787f5..1b5e750f9513 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -38,7 +38,6 @@
 
 BitSet BitSet::operator<<( sal_uInt16 nOffset ) const
 {
-    DBG_MEMTEST();
     // create a work-copy, return it if nothing to shift
     BitSet aSet(*this);
     if ( nOffset == 0 )
@@ -89,7 +88,6 @@ BitSet BitSet::operator<<( sal_uInt16 nOffset ) const
 
 BitSet BitSet::operator>>( sal_uInt16 ) const
 {
-    DBG_MEMTEST();
     return BitSet();
 }
 
@@ -99,12 +97,10 @@ BitSet BitSet::operator>>( sal_uInt16 ) const
 
 void BitSet::CopyFrom( const BitSet& rSet )
 {
-    DBG_MEMTEST();
     nCount = rSet.nCount;
     nBlocks = rSet.nBlocks;
     if ( rSet.nBlocks )
     {
-        DBG_MEMTEST();
         pBitmap = new sal_uIntPtr[nBlocks];
         memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
     }
@@ -118,7 +114,6 @@ void BitSet::CopyFrom( const BitSet& rSet )
 
 BitSet::BitSet()
 {
-    DBG_MEMTEST();
     nCount = 0;
     nBlocks = 0;
     pBitmap = 0;
@@ -130,7 +125,6 @@ BitSet::BitSet()
 
 BitSet::BitSet( const BitSet& rOrig )
 {
-    DBG_MEMTEST();
     CopyFrom(rOrig);
 }
 
@@ -140,7 +134,6 @@ BitSet::BitSet( const BitSet& rOrig )
 
 BitSet::~BitSet()
 {
-    DBG_MEMTEST();
     delete [] pBitmap;
 }
 
@@ -150,7 +143,6 @@ BitSet::~BitSet()
 
 BitSet& BitSet::operator=( const BitSet& rOrig )
 {
-    DBG_MEMTEST();
     if ( this != &rOrig )
     {
         delete [] pBitmap;
@@ -165,7 +157,6 @@ BitSet& BitSet::operator=( const BitSet& rOrig )
 
 BitSet& BitSet::operator=( sal_uInt16 nBit )
 {
-    DBG_MEMTEST();
     delete [] pBitmap;
 
     nBlocks = nBit / 32;
@@ -186,7 +177,6 @@ BitSet& BitSet::operator=( sal_uInt16 nBit )
 
 BitSet& BitSet::operator-=(sal_uInt16 nBit)
 {
-    DBG_MEMTEST();
     sal_uInt16 nBlock = nBit / 32;
     sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
@@ -208,7 +198,6 @@ BitSet& BitSet::operator-=(sal_uInt16 nBit)
 
 BitSet& BitSet::operator|=( const BitSet& rSet )
 {
-    DBG_MEMTEST();
     sal_uInt16 nMax = Min(nBlocks, rSet.nBlocks);
 
     // expand the bitmap
@@ -245,7 +234,6 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
 
 BitSet& BitSet::operator|=( sal_uInt16 nBit )
 {
-    DBG_MEMTEST();
     sal_uInt16 nBlock = nBit / 32;
     sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
@@ -278,7 +266,6 @@ BitSet& BitSet::operator|=( sal_uInt16 nBit )
 
 sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
 {
-    DBG_MEMTEST();
     sal_uInt16 nBlock = nBit / 32;
     sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
@@ -293,7 +280,6 @@ sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
 
 sal_Bool BitSet::operator==( const BitSet& rSet ) const
 {
-    DBG_MEMTEST();
     if ( nBlocks != rSet.nBlocks )
         return sal_False;
 
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 5f9a14f9b5d3..b6d6a0413446 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -36,7 +36,6 @@ SfxPtrArr::SfxPtrArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
-    DBG_MEMTEST();
     sal_uInt16 nMSCBug = nInitSize;
 
     if ( nMSCBug > 0 )
@@ -49,7 +48,6 @@ SfxPtrArr::SfxPtrArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
 
 SfxPtrArr::SfxPtrArr( const SfxPtrArr& rOrig )
 {
-    DBG_MEMTEST();
     nUsed = rOrig.nUsed;
     nGrow = rOrig.nGrow;
     nUnused = rOrig.nUnused;
@@ -67,7 +65,6 @@ SfxPtrArr::SfxPtrArr( const SfxPtrArr& rOrig )
 
 SfxPtrArr::~SfxPtrArr()
 {
-    DBG_MEMTEST();
     delete [] pData;
 }
 
@@ -75,7 +72,6 @@ SfxPtrArr::~SfxPtrArr()
 
 SfxPtrArr& SfxPtrArr::operator=( const SfxPtrArr& rOrig )
 {
-    DBG_MEMTEST();
 
     delete [] pData;
 
@@ -97,7 +93,6 @@ SfxPtrArr& SfxPtrArr::operator=( const SfxPtrArr& rOrig )
 
 void SfxPtrArr::Append( void* aElem )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
     // Does the Array need to be copied?
     if ( nUnused == 0 )
@@ -124,7 +119,6 @@ void SfxPtrArr::Append( void* aElem )
 
 sal_uInt16 SfxPtrArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
-    DBG_MEMTEST();
     // Adjust nLen, thus to avoid deleting beyond the end
     nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
@@ -178,7 +172,6 @@ sal_uInt16 SfxPtrArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 
 sal_Bool SfxPtrArr::Remove( void* aElem )
 {
-    DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
         return sal_False;
@@ -198,7 +191,6 @@ sal_Bool SfxPtrArr::Remove( void* aElem )
 
 sal_Bool SfxPtrArr::Contains( const void* rItem ) const
 {
-    DBG_MEMTEST();
     if ( !nUsed )
         return sal_False;
 
@@ -216,7 +208,6 @@ sal_Bool SfxPtrArr::Contains( const void* rItem ) const
 
 void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
     // Does the Array have to be copied?
     if ( nUnused == 0 )
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index e063e119be30..e80b9cbdfbe5 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -471,7 +471,6 @@ void SfxBindings::Update
     sal_uInt16      nId     // the bound and up-to-date Slot-Id
 )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     if ( pDispatcher )
@@ -534,7 +533,6 @@ void SfxBindings::Update
 
 void SfxBindings::Update()
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     if ( pImp->pSubBindings )
@@ -652,7 +650,6 @@ SfxStateCache* SfxBindings::GetStateCache
                            or where it was inserted. */
 )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
     // is the specified function bound?
     const sal_uInt16 nStart = ( pPos ? *pPos : 0 );
@@ -679,8 +676,6 @@ void SfxBindings::InvalidateAll
     DBG_PROFSTART(SfxBindingsInvalidateAll);
     DBG_ASSERT( !pImp->bInUpdate, "SfxBindings::Invalidate while in update" );
 
-    DBG_MEMTEST();
-
     if ( pImp->pSubBindings )
         pImp->pSubBindings->InvalidateAll( bWithMsg );
 
@@ -720,7 +715,6 @@ void SfxBindings::Invalidate
 )
 {
     DBG_PROFSTART(SfxBindingsInvalidateAll);
-    DBG_MEMTEST();
 
     if ( pImp->bInUpdate )
     {
@@ -792,7 +786,6 @@ void SfxBindings::InvalidateShell
         return;
 
     DBG_PROFSTART(SfxBindingsInvalidateAll);
-    DBG_MEMTEST();
 
     // flush now already, it is done in GetShellLevel (rsh) anyway,
     // important so that is set correctly: pimp-> ball(Msg)Dirty
@@ -839,8 +832,6 @@ void SfxBindings::Invalidate
     sal_uInt16 nId              // Status value to be set
 )
 {
-    DBG_MEMTEST();
-
     if ( pImp->bInUpdate )
     {
         AddSlotToInvalidateSlotsMap_Impl( nId );
@@ -878,7 +869,6 @@ void SfxBindings::Invalidate
     sal_Bool    bWithMsg            // Get new SlotServer?
 )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( !pImp->bInUpdate, "SfxBindings::Invalidate while in update" );
 
     if ( pImp->pSubBindings )
@@ -911,7 +901,6 @@ void SfxBindings::Invalidate
 
 sal_Bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
     return GetStateCache(nSlotId, &nStartSearchAt ) != 0;
 }
@@ -920,7 +909,6 @@ sal_Bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt )
 
 sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
     DBG_PROFSTART(SfxBindingsMsgPos);
 
@@ -1006,7 +994,6 @@ void SfxBindings::Register( SfxControllerItem& rItem )
 
 void SfxBindings::Register_Impl( SfxControllerItem& rItem, sal_Bool bInternal )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( nRegLevel > 0, "registration without EnterRegistrations" );
     DBG_ASSERT( !pImp->bInNextJob, "SfxBindings::Register while status-updating" );
 
@@ -1043,7 +1030,6 @@ void SfxBindings::Register_Impl( SfxControllerItem& rItem, sal_Bool bInternal )
 
 void SfxBindings::Release( SfxControllerItem& rItem )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
     DBG_ASSERT( !pImp->bInNextJob, "SfxBindings::Release while status-updating" );
     ENTERREGISTRATIONS();
@@ -1090,7 +1076,6 @@ void SfxBindings::Release( SfxControllerItem& rItem )
 const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi,
             const SfxPoolItem **ppInternalArgs )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     if( !nId || !pDispatcher )
@@ -1102,7 +1087,6 @@ const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolIt
 sal_Bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode,
                         const SfxPoolItem **ppInternalArgs )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     if( !nId || !pDispatcher )
@@ -1314,7 +1298,6 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
 void SfxBindings::UpdateSlotServer_Impl()
 {
     DBG_PROFSTART(SfxBindingsUpdateServers);
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     // synchronize
@@ -1355,7 +1338,6 @@ SfxItemSet* SfxBindings::CreateSet_Impl
     SfxFoundCacheArr_Impl&  rFound      // out: List of Caches for Siblings
 )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     DBG_ASSERT( !pImp->bMsgDirty, "CreateSet_Impl with dirty MessageServer" );
@@ -1611,7 +1593,6 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 #endif
     const unsigned MAX_INPUT_DELAY = 200;
 
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     DBG_PROFSTART(SfxBindingsNextJob_Impl0);
@@ -1739,7 +1720,6 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 
 sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
 {
-    DBG_MEMTEST();
     SAL_INFO(
         "sfx2",
         std::setw(Min(nRegLevel, sal_uInt16(8))) << ' ' << "this = " << this
@@ -1782,7 +1762,6 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
 void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int nLine )
 {
     (void)nLevel; // unused variable
-    DBG_MEMTEST();
     DBG_ASSERT( nRegLevel, "Leave without Enter" );
     DBG_ASSERT( nLevel == USHRT_MAX || nLevel == nRegLevel, "wrong Leave" );
 
@@ -1853,7 +1832,6 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
 
 const SfxSlot* SfxBindings::GetSlot(sal_uInt16 nSlotId)
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     // synchronizing
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 3afe82b33054..d6dda852fa89 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -66,7 +66,6 @@ void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType )
 
 SfxControllerItem* SfxControllerItem::GetItemLink()
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     return pNext == this ? 0 : pNext;
 }
@@ -76,7 +75,6 @@ SfxControllerItem* SfxControllerItem::GetItemLink()
 
 sal_Bool SfxControllerItem::IsBound() const
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     return pNext != this;
 }
@@ -86,7 +84,6 @@ sal_Bool SfxControllerItem::IsBound() const
 
 void SfxControllerItem::Bind( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings || pBindinx, "No Bindings");
 
@@ -105,7 +102,6 @@ void SfxControllerItem::Bind( sal_uInt16 nNewId, SfxBindings *pBindinx )
 
 void SfxControllerItem::BindInternal_Impl( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings || pBindinx, "No Bindings");
 
@@ -140,7 +136,6 @@ void SfxControllerItem::UnBind()
     <SfxControllerItem::ClearCache()>
 */
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings, "No Bindings");
     DBG_ASSERT( IsBound(), "unbindings unbound SfxControllerItem" );
@@ -166,7 +161,6 @@ void SfxControllerItem::ReBind()
 */
 
 {
-    DBG_MEMTEST();
 DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings, "No Bindings");
     DBG_ASSERT( !IsBound(), "bindings rebound SfxControllerItem" );
@@ -188,7 +182,6 @@ void SfxControllerItem::UpdateSlot()
 */
 
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings, "No Bindings");
 
@@ -220,7 +213,6 @@ void SfxControllerItem::ClearCache()
 
 
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT(pBindings, "No Bindings");
 
@@ -232,7 +224,6 @@ void SfxControllerItem::ClearCache()
 
 SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLink )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     SfxControllerItem* pOldLink = pNext;
     pNext = pNewLink;
@@ -244,7 +235,6 @@ SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLin
 
 void SfxControllerItem::SetId( sal_uInt16 nItemId )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
     DBG_ASSERT( !IsBound(), "changing id of bound binding" );
     nId = nItemId;
@@ -259,7 +249,6 @@ SfxControllerItem::SfxControllerItem():
     pNext(this),
     pBindings(0)
 {
-    DBG_MEMTEST();
     DBG_CTOR(SfxControllerItem, 0);
 }
 
@@ -271,7 +260,6 @@ SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ):
     pNext(this),
     pBindings(&rBindings)
 {
-    DBG_MEMTEST();
     DBG_CTOR(SfxControllerItem, 0);
     Bind(nId, &rBindings);
 }
@@ -281,7 +269,6 @@ SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ):
 
 SfxControllerItem::~SfxControllerItem()
 {
-    DBG_MEMTEST();
     if ( IsBound() )
         pBindings->Release(*this);
     DBG_DTOR(SfxControllerItem, 0);
@@ -317,7 +304,6 @@ void SfxControllerItem::StateChanged
 */
 
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
 }
 
@@ -325,7 +311,6 @@ void SfxControllerItem::StateChanged
 
 void SfxControllerItem::DeleteFloatingWindow()
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
 }
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 4f2331eb46c3..0fc008a32eab 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -463,7 +463,6 @@ void SfxDispatcher::Pop
 */
 
 {
-    DBG_MEMTEST();
     DBG_ASSERT( rShell.GetInterface(),
                 "pushing SfxShell without previous RegisterInterface()" );
 
@@ -547,7 +546,6 @@ IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid )
 
 {
     (void)pvoid; // unused
-    DBG_MEMTEST();
 
     Flush();
     Update_Impl();
@@ -572,7 +570,6 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& rShell, sal_Bool bDee
 */
 
 {
-    DBG_MEMTEST();
     SFX_STACK(SfxDispatcher::CheckVirtualStack);
 
     SfxShellStack_Impl aStack( pImp->aStack );
@@ -621,7 +618,6 @@ sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell& rShell )
 */
 
 {
-    DBG_MEMTEST();
     SFX_STACK(SfxDispatcher::GetShellLevel);
     Flush();
 
@@ -653,8 +649,6 @@ SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const
 */
 
 {
-    DBG_MEMTEST();
-
     sal_uInt16 nShellCount = pImp->aStack.Count();
     if ( nIdx < nShellCount )
         return pImp->aStack.Top(nIdx);
@@ -695,7 +689,6 @@ SfxViewFrame* SfxDispatcher::GetFrame() const
 */
 
 {
-    DBG_MEMTEST();
     return pImp->pFrame;
 }
 
@@ -717,7 +710,6 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
 */
 
 {
-    DBG_MEMTEST();
     SFX_STACK(SfxDispatcher::DoActivate);
     if ( bMDI )
     {
@@ -798,7 +790,6 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
 */
 
 {
-    DBG_MEMTEST();
     SFX_STACK(SfxDispatcher::DoDeactivate);
 
     SfxApplication *pSfxApp = SFX_APP();
@@ -937,7 +928,6 @@ void SfxDispatcher::_Execute
 */
 
 {
-    DBG_MEMTEST();
     DBG_ASSERT( !pImp->bFlushing, "recursive call to dispatcher" );
     DBG_ASSERT( !pImp->aToDoStack.Count(), "unprepared InPlace _Execute" );
 
@@ -1248,7 +1238,6 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
 */
 
 {
-    DBG_MEMTEST();
     DBG_ASSERT( !pImp->bFlushing, "recursive call to dispatcher" );
     SFX_STACK(SfxDispatcher::PostMsgHandler);
 
@@ -1600,7 +1589,6 @@ void SfxDispatcher::FlushImpl()
 
 {
     DBG_PROFSTART(SfxDispatcherFlush);
-    DBG_MEMTEST();
     SFX_STACK(SfxDispatcher::FlushImpl);
 
     OSL_TRACE("Flushing dispatcher!");
@@ -1789,7 +1777,6 @@ int
 
 SfxCompareSIDs_Impl( const void* pSmaller, const void* pBigger )
 {
-    DBG_MEMTEST();
     return ( (long) *((sal_uInt16*)pSmaller) ) - ( (long) *((sal_uInt16*)pBigger) );
 }
 
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 0e82456c5149..c9afd9869204 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -97,8 +97,6 @@ SfxSlotPool::~SfxSlotPool()
 
 void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
 {
-    DBG_MEMTEST();
-
     // add to the list of SfxObjectInterface instances
     if ( _pInterfaces == 0 )
         _pInterfaces = new SfxInterfaceArr_Impl;
@@ -150,7 +148,6 @@ TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
 
 void SfxSlotPool::ReleaseInterface( SfxInterface& rInterface )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces, "releasing SfxInterface, but there are none" );
     // remove from the list of SfxInterface instances
     _pInterfaces->Remove(&rInterface);
@@ -162,7 +159,6 @@ void SfxSlotPool::ReleaseInterface( SfxInterface& rInterface )
 
 const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // First, search their own interfaces
@@ -183,7 +179,6 @@ const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId )
 
 String SfxSlotPool::SeekGroup( sal_uInt16 nNo )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // if the group exists, use it
@@ -237,7 +232,6 @@ sal_uInt16 SfxSlotPool::GetGroupCount()
 
 const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // The numbering starts at the interfaces of the parent pool
@@ -281,7 +275,6 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
 
 const SfxSlot* SfxSlotPool::NextSlot()
 {
-    DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // The numbering starts at the interfaces of the parent pool
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 2b11f2901ab9..f6409c56eb0c 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -54,7 +54,6 @@ int
 
 SfxCompareSlots_Impl( const void* pSmaller, const void* pBigger )
 {
-    DBG_MEMTEST();
     return ( (int) ((SfxSlot*)pSmaller)->GetSlotId() ) -
            ( (int) ((SfxSlot*)pBigger)->GetSlotId() );
 }
@@ -325,7 +324,6 @@ SfxInterface::~SfxInterface()
 
 const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxInterface, 0);
     DBG_ASSERT( this && pSlots && nCount, "" );
 
@@ -360,7 +358,6 @@ const SfxSlot* SfxInterface::GetSlot( const String& rCommand ) const
 
 const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxInterface, 0);
     DBG_ASSERT( this && pSlots && nCount, "" );
 
@@ -379,7 +376,6 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
 
 const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxInterface, 0);
     DBG_ASSERT( this && pSlots && nCount, "" );
 
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 5a9b3411ce4d..d4a8786d32ee 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -129,8 +129,6 @@ void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool )
 
 SfxRequest::~SfxRequest()
 {
-    DBG_MEMTEST();
-
     // Leave out Done() marked requests with 'rem'
     if ( pImp->xRecorder.is() && !pImp->bDone && !pImp->bIgnored )
         pImp->Record( uno::Sequence < beans::PropertyValue >() );
@@ -153,8 +151,6 @@ SfxRequest::SfxRequest
     pArgs(rOrig.pArgs? new SfxAllItemSet(*rOrig.pArgs): 0),
     pImp( new SfxRequest_Impl(this) )
 {
-    DBG_MEMTEST();
-
     pImp->bAllowRecording = rOrig.pImp->bAllowRecording;
     pImp->bDone = sal_False;
     pImp->bIgnored = sal_False;
@@ -197,8 +193,6 @@ SfxRequest::SfxRequest
     pArgs(0),
     pImp( new SfxRequest_Impl(this) )
 {
-    DBG_MEMTEST();
-
     pImp->bDone = sal_False;
     pImp->bIgnored = sal_False;
     pImp->SetPool( &pViewFrame->GetPool() );
@@ -241,8 +235,6 @@ SfxRequest::SfxRequest
     pArgs(0),
     pImp( new SfxRequest_Impl(this) )
 {
-    DBG_MEMTEST();
-
     pImp->bDone = sal_False;
     pImp->bIgnored = sal_False;
     pImp->SetPool( &rPool );
@@ -264,8 +256,6 @@ SfxRequest::SfxRequest
     pArgs(new SfxAllItemSet(rPool)),
     pImp( new SfxRequest_Impl(this) )
 {
-    DBG_MEMTEST();
-
     pImp->bDone = sal_False;
     pImp->bIgnored = sal_False;
     pImp->SetPool( &rPool );
@@ -292,8 +282,6 @@ SfxRequest::SfxRequest
     pArgs(new SfxAllItemSet(rSfxArgs)),
     pImp( new SfxRequest_Impl(this) )
 {
-    DBG_MEMTEST();
-
     pImp->bDone = sal_False;
     pImp->bIgnored = sal_False;
     pImp->SetPool( rSfxArgs.GetPool() );
@@ -418,7 +406,6 @@ void SfxRequest::Record_Impl
 */
 
 {
-    DBG_MEMTEST();
     pImp->pShell = &rSh;
     pImp->pSlot = &rSlot;
     pImp->xRecorder = xRecorder;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 0219f142c3e0..d1a8a5d8452c 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -209,7 +209,6 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ):
     eLastState( 0 ),
     bItemVisible( sal_True )
 {
-    DBG_MEMTEST();
     DBG_CTOR(SfxStateCache, 0);
     bCtrlDirty = sal_True;
     bSlotDirty = sal_True;
@@ -221,7 +220,6 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ):
 
 SfxStateCache::~SfxStateCache()
 {
-    DBG_MEMTEST();
     DBG_DTOR(SfxStateCache, 0);
     DBG_ASSERT( pController == 0 && pInternalController == 0, "there are still Controllers registered" );
     if ( !IsInvalidItem(pLastItem) )
@@ -255,7 +253,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_MEMTEST();
     DBG_CHKTHIS(SfxStateCache, 0);
 
     if ( bSlotDirty )
@@ -423,7 +420,6 @@ void SfxStateCache::SetState_Impl
 )
 {
     (void)bMaybeDirty; //unused
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxStateCache, 0);
 
     // If a hard update occurs between enter- and leave-registrations is a
@@ -484,7 +480,6 @@ void SfxStateCache::SetState_Impl
 
 void SfxStateCache::SetCachedState( sal_Bool bAlways )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxStateCache, 0);
     DBG_ASSERT(pController==NULL||pController->GetId()==nId, "Cache with wrong ControllerItem" );
     DBG_PROFSTART(SfxStateCacheSetState);
@@ -519,7 +514,6 @@ void SfxStateCache::SetCachedState( sal_Bool bAlways )
 
 void SfxStateCache::DeleteFloatingWindows()
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxStateCache, 0);
 
     SfxControllerItem *pNextCtrl=0;
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index eac13490e685..68fe2c6ca056 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -83,8 +83,6 @@ void SfxMenuControl::Bind(
     const String& rTitle,
     SfxBindings &rBindings )
 {
-    DBG_MEMTEST();
-
     aTitle = rTitle;
     pOwnMenu = pOwn;
     pSubMenu = 0;
@@ -108,7 +106,6 @@ void SfxMenuControl::Bind(
     const String& rTitle,
     SfxBindings &rBindings )
 {
-    DBG_MEMTEST();
     SetId( nSlotId );
     SetBindings(rBindings);
     pOwnMenu = pOwn;
@@ -125,7 +122,6 @@ SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings )
     pSubMenu(0),
     b_ShowStrings(bShowStrings)
 {
-    DBG_MEMTEST();
 }
 
 //--------------------------------------------------------------------
@@ -136,7 +132,6 @@ SfxMenuControl::SfxMenuControl():
     pSubMenu(0),
     b_ShowStrings(sal_False)
 {
-    DBG_MEMTEST();
 }
 
 //--------------------------------------------------------------------
@@ -147,8 +142,6 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings):
     pSubMenu(0),
     b_ShowStrings(sal_False)
 {
-    DBG_MEMTEST();
-
     // This constructor should make it possible already during the design
     // to fall back to the bindings, but can as always be bound later.
     // The usefullness of this is for example if a StatusForwarder should
@@ -176,7 +169,6 @@ void SfxMenuControl::StateChanged
 )
 {
     (void)nSID;
-    DBG_MEMTEST();
     DBG_ASSERT( nSID == GetId(), "strange SID" );
     DBG_ASSERT( pOwnMenu != 0, "setting state to dangling SfxMenuControl" );
 
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index f5c7a3c4d792..920c4158c79b 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -106,7 +106,6 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu )
 
 SfxMenuManager::~SfxMenuManager()
 {
-    DBG_MEMTEST();
     pBindings->ENTERREGISTRATIONS();
     delete pMenu;
     pBindings->LEAVEREGISTRATIONS();
@@ -116,7 +115,6 @@ SfxMenuManager::~SfxMenuManager()
 
 void SfxMenuManager::Construct( SfxVirtualMenu& rMenu )
 {
-    DBG_MEMTEST();
     pMenu = &rMenu;
 
     // set the handlers
@@ -254,8 +252,6 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
 // executes the function for the selected item
 IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
 {
-    DBG_MEMTEST();
-
     sal_uInt16 nId = (sal_uInt16) pSelMenu->GetCurItemId();
     String aCommand = pSelMenu->GetItemCommand( nId );
     if ( !aCommand.Len() && pBindings )
@@ -298,7 +294,6 @@ void SfxPopupMenuManager::RemoveDisabledEntries()
 
 sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
 {
-    DBG_MEMTEST();
     sal_uInt16 nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
     delete pStaticThesSubMenu;  pStaticThesSubMenu = NULL;
     return nVal;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 93b1b81abfc5..4943377be372 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -195,7 +195,6 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId,
     bHelpInitialized( bWithHelp ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
-    DBG_MEMTEST();
     DBG_CTOR(SfxVirtualMenu, 0);
     pSVMenu = &rMenu;
 
@@ -230,7 +229,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
     bHelpInitialized( bWithHelp ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
-    DBG_MEMTEST();
     DBG_CTOR(SfxVirtualMenu, 0);
 
     pSVMenu = pStarViewMenu;
@@ -260,7 +258,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
 
 SfxVirtualMenu::~SfxVirtualMenu()
 {
-    DBG_MEMTEST();
     DBG_DTOR(SfxVirtualMenu, 0);
 
     DELETEZ( pImageControl );
@@ -316,7 +313,6 @@ SfxVirtualMenu::~SfxVirtualMenu()
 
 void SfxVirtualMenu::CreateFromSVMenu()
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     // Merge Addon popup menus into the SV Menu
@@ -524,7 +520,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
 IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     // own StarView-Menu
@@ -823,7 +818,6 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
 
 IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_OUTF( ("SfxVirtualMenu %lx activated %lx, own %lx", this, pMenu, pSVMenu));
 
@@ -966,7 +960,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 
 IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
 {
-    DBG_MEMTEST();
     DBG_OUTF( ("SfxVirtualMenu %lx deactivated %lx, own %lx", this, pMenu, pSVMenu) );
     if ( bIsActive && ( 0 == pMenu || pMenu == pSVMenu ) )
     {
@@ -1038,7 +1031,6 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
 
 Menu* SfxVirtualMenu::GetSVMenu() const
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     return pSVMenu;
@@ -1050,7 +1042,6 @@ Menu* SfxVirtualMenu::GetSVMenu() const
 
 void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_ASSERT( this != 0, "");
     DBG_ASSERT( pSVMenu != 0, "" );
@@ -1063,7 +1054,6 @@ void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
 
 void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_ASSERT( this != 0, "");
     DBG_ASSERT( pSVMenu != 0, "" );
@@ -1077,7 +1067,6 @@ void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
 
 void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const String& rText )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
     DBG_ASSERT( this != 0, "");
     DBG_ASSERT( pSVMenu != 0, "" );
@@ -1090,7 +1079,6 @@ void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const String& rText )
 
 void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
@@ -1109,7 +1097,6 @@ void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
 
 void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, sal_Bool /*bOLE*/ )
 {
-    DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 8892c2631b83..aa69f37c15b9 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -36,7 +36,6 @@
 
 void SfxHintPoster::RegisterEvent()
 {
-    DBG_MEMTEST();
 }
 
 //--------------------------------------------------------------------
@@ -72,7 +71,6 @@ void SfxHintPoster::Post( SfxHint* pHintToPost )
 
 IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
 {
-    DBG_MEMTEST();
     Event( pPostedHint );
     ReleaseRef();
     return 0;
@@ -90,7 +88,6 @@ void SfxHintPoster::Event( SfxHint* pPostedHint )
 
 void SfxHintPoster::SetEventHdl( const GenLink& rLink )
 {
-    DBG_MEMTEST();
     aLink = rLink;
 }
 
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index b97c0d58d91e..7049cc1c95bd 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -455,7 +455,6 @@ void SfxStatusBarControl::StateChanged
 */
 
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pBar != 0, "setting state to dangling StatusBar" );
 
     const SfxStringItem* pStr = PTR_CAST( SfxStringItem, pState );
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index a5469b30d47e..540211e4d972 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -931,7 +931,6 @@ void SfxToolBoxControl::StateChanged
     const SfxPoolItem*  pState
 )
 {
-    DBG_MEMTEST();
     DBG_ASSERT( pImpl->pBox != 0, "setting state to dangling ToolBox" );
 
     if ( GetId() >= SID_OBJECTMENU0 && GetId() <= SID_OBJECTMENU_LAST )
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 36b1e3e02f47..e55e43ab69be 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2831,7 +2831,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
 
 void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
 {
-    DBG_MEMTEST();
     switch ( rReq.GetSlot() )
     {
         case SID_STOP_RECORDING :
@@ -3014,8 +3013,6 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
 
 void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
 {
-    DBG_MEMTEST();
-
     const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set without range");
     while ( *pRanges )
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index 3746350a2d44..c335a0aa6757 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -70,18 +70,6 @@ typedef void (*DbgTestSolarMutexProc)();
 #define DBG_TEST_XTOR_REPORT        (0x00000008)
 #define DBG_TEST_XTOR_TRACE         (0x00000010)
 
-#define DBG_TEST_MEM                (0x00FFF000)
-#define DBG_TEST_MEM_INIT           (0x00001000)
-#define DBG_TEST_MEM_OVERWRITE      (0x00002000)
-#define DBG_TEST_MEM_OVERWRITEFREE  (0x00004000)
-#define DBG_TEST_MEM_POINTER        (0x00008000)
-#define DBG_TEST_MEM_REPORT         (0x00010000)
-#define DBG_TEST_MEM_TRACE          (0x00020000)
-#define DBG_TEST_MEM_NEWDEL         (0x00040000)
-#define DBG_TEST_MEM_XTOR           (0x00080000)
-#define DBG_TEST_MEM_SYSALLOC       (0x00100000)
-#define DBG_TEST_MEM_LEAKREPORT     (0x00200000)
-
 #define DBG_TEST_PROFILING          (0x01000000)
 #define DBG_TEST_RESOURCE           (0x02000000)
 #define DBG_TEST_DIALOG             (0x04000000)
@@ -113,9 +101,6 @@ struct DbgData
     sal_uIntPtr       nWarningOut;
     sal_uIntPtr       nErrorOut;
     sal_uIntPtr       bHookOSLAssert;
-    sal_uInt8        bMemInit;
-    sal_uInt8        bMemBound;
-    sal_uInt8        bMemFree;
     sal_Char    aDebugName[260];
     sal_Char    aInclFilter[512];
     sal_Char    aExclFilter[512];
@@ -140,9 +125,7 @@ struct DbgDataType
 #define DBG_FUNC_SETPRINTMSGBOX     6
 #define DBG_FUNC_SETPRINTWINDOW     7
 #define DBG_FUNC_SETPRINTTESTTOOL   8
-#define DBG_FUNC_MEMTEST            9
 #define DBG_FUNC_XTORINFO           10
-#define DBG_FUNC_MEMINFO            11
 #define DBG_FUNC_COREDUMP           12
 #define DBG_FUNC_ALLERROROUT        13
 #define DBG_FUNC_SETTESTSOLARMUTEX  14
@@ -317,11 +300,6 @@ inline void DbgXtorInfo( sal_Char* pBuf )
     DbgFunc( DBG_FUNC_XTORINFO, (void*)pBuf );
 }
 
-inline void DbgMemInfo( sal_Char* pBuf )
-{
-    DbgFunc( DBG_FUNC_MEMINFO, (void*)pBuf );
-}
-
 inline void DbgCoreDump()
 {
     DbgFunc( DBG_FUNC_COREDUMP );
@@ -365,11 +343,6 @@ TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... )
 
 // --- Dbg-Test-Functions ---
 
-inline void DbgMemTest( void* p = NULL )
-{
-    DbgFunc( DBG_FUNC_MEMTEST, p );
-}
-
 #define DBG_PROF_START              1
 #define DBG_PROF_STOP               2
 #define DBG_PROF_CONTINUE           3
@@ -429,9 +402,6 @@ public:
 #define DBG_STARTAPPEXECUTE()               DbgStartStackTree()
 #define DBG_ENDAPPEXECUTE()                 DbgEndStackTree()
 
-#define DBG_MEMTEST()                       DbgMemTest()
-#define DBG_MEMTEST_PTR( p )                DbgMemTest( (void*)p )
-
 #define DBG_PROFSTART( aName )                      \
     DbgProf( DBG_PROF_START, DBG_FUNC( aName ) )
 
@@ -544,9 +514,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
 #define DBG_STARTAPPEXECUTE() ((void)0)
 #define DBG_ENDAPPEXECUTE() ((void)0)
 
-#define DBG_MEMTEST() ((void)0)
-#define DBG_MEMTEST_PTR( p ) ((void)0)
-
 #define DBG_NAME( aName )
 #define DBG_NAMEEX( aName )
 #define DBG_NAMEEX_VISIBILITY( aName, vis )
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 676128d1080a..5976b1c9a03a 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -146,7 +146,7 @@ struct DebugData
         ,pOldDebugMessageFunc( NULL )
         ,bOslIsHooked( false )
     {
-        aDbgData.nTestFlags = DBG_TEST_RESOURCE | DBG_TEST_MEM_INIT;
+        aDbgData.nTestFlags = DBG_TEST_RESOURCE;
         aDbgData.bOverwrite = sal_True;
         aDbgData.nTraceOut = DBG_OUT_NULL;
         aDbgData.nWarningOut = DBG_OUT_NULL;
@@ -155,9 +155,6 @@ struct DebugData
 #else
         aDbgData.nErrorOut = DBG_OUT_MSGBOX;
 #endif
-        aDbgData.bMemInit = 0x77;
-        aDbgData.bMemBound = 0x55;
-        aDbgData.bMemFree = 0x33;
         aDbgData.bHookOSLAssert = sal_True;
         aDbgData.aDebugName[0] = 0;
         aDbgData.aInclFilter[0] = 0;
@@ -234,15 +231,6 @@ void ImplDbgUnlock()
 
 // =======================================================================
 
-#if defined WNT
-//#define SV_MEMMGR //
-#endif
-#ifdef SV_MEMMGR
-void DbgImpCheckMemory( void* p = NULL );
-void DbgImpCheckMemoryDeInit();
-void DbgImpMemoryInfo( sal_Char* pBuf );
-#endif
-
 #define FILE_LINEEND    "\n"
 
 // =======================================================================
@@ -724,25 +712,6 @@ static DebugData* GetDebugData()
                     lcl_tryReadConfigBoolean( pLine, nLineLength, "oslhook", &aDebugData.aDbgData.bHookOSLAssert );
                 }
 
-                // elements of the [memory] section
-                if ( eCurrentSection == eMemory )
-                {
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "initialize", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_INIT );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "overwrite", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_OVERWRITE );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "overwrite_free", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_OVERWRITEFREE );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "pointer", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_POINTER );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "report", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_REPORT );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "trace", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_TRACE );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "new_and_delete", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_NEWDEL );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "object_test", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_XTOR );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "sys_alloc", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_SYSALLOC );
-                    lcl_tryReadConfigFlag( pLine, nLineLength, "leak_report", &aDebugData.aDbgData.nTestFlags, DBG_TEST_MEM_LEAKREPORT );
-
-                    lcl_tryReadHexByte( pLine, nLineLength, "init_byte", &aDebugData.aDbgData.bMemInit );
-                    lcl_tryReadHexByte( pLine, nLineLength, "bound_byte", &aDebugData.aDbgData.bMemBound );
-                    lcl_tryReadHexByte( pLine, nLineLength, "free_byte", &aDebugData.aDbgData.bMemFree );
-                }
-
                 // elements of the [gui] section
                 if ( eCurrentSection == eGUI )
                 {
@@ -1018,7 +987,7 @@ static void DebugDeInit()
     // Variablen abstuerzen, da die Pointeranpassung dann nicht mehr richtig
     // funktioniert
     pData->aDbgData.nTraceOut   = nOldOut;
-    pData->aDbgData.nTestFlags &= (DBG_TEST_MEM | DBG_TEST_PROFILING);
+    pData->aDbgData.nTestFlags &= DBG_TEST_PROFILING;
     pData->aDbgPrintUserChannels.clear();
     pData->pDbgPrintTestTool    = NULL;
     pData->pDbgPrintWindow      = NULL;
@@ -1072,10 +1041,6 @@ static void DebugGlobalDeInit()
         pData->pProfList = NULL;
     }
 
-#ifdef SV_MEMMGR
-    DbgImpCheckMemoryDeInit();
-#endif
-
     // Profiling-Flags ausschalten
     pData->aDbgData.nTraceOut   = nOldOut;
     pData->aDbgData.nTestFlags &= ~DBG_TEST_PROFILING;
@@ -1212,24 +1177,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
                 lcl_writeConfigBoolean( pIniFile, "oslhook", pData->bHookOSLAssert );
 
                 lcl_lineFeed( pIniFile );
-                lcl_startSection( pIniFile, eMemory );
-                lcl_writeConfigFlag( pIniFile, "initialize", pData->nTestFlags, DBG_TEST_MEM_INIT );
-                lcl_writeConfigFlag( pIniFile, "overwrite", pData->nTestFlags, DBG_TEST_MEM_OVERWRITE );
-                lcl_writeConfigFlag( pIniFile, "overwrite_free", pData->nTestFlags, DBG_TEST_MEM_OVERWRITEFREE );
-                lcl_writeConfigFlag( pIniFile, "pointer", pData->nTestFlags, DBG_TEST_MEM_POINTER );
-                lcl_writeConfigFlag( pIniFile, "report", pData->nTestFlags, DBG_TEST_MEM_REPORT );
-                lcl_writeConfigFlag( pIniFile, "trace", pData->nTestFlags, DBG_TEST_MEM_TRACE );
-                lcl_writeConfigFlag( pIniFile, "new_and_delete", pData->nTestFlags, DBG_TEST_MEM_NEWDEL );
-                lcl_writeConfigFlag( pIniFile, "object_test", pData->nTestFlags, DBG_TEST_MEM_XTOR );
-                lcl_writeConfigFlag( pIniFile, "sys_alloc", pData->nTestFlags, DBG_TEST_MEM_SYSALLOC );
-                lcl_writeConfigFlag( pIniFile, "leak_report", pData->nTestFlags, DBG_TEST_MEM_LEAKREPORT );
-
-                lcl_lineFeed( pIniFile );
-                lcl_writeHexByte( pIniFile, "init_byte", pData->bMemInit );
-                lcl_writeHexByte( pIniFile, "bound_byte", pData->bMemBound );
-                lcl_writeHexByte( pIniFile, "free_byte", pData->bMemFree );
-
-                lcl_lineFeed( pIniFile );
                 lcl_startSection( pIniFile, eGUI );
                 lcl_writeConfigString( pIniFile, "debug_window_state", pData->aDbgWinState );
 
@@ -1252,22 +1199,10 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
                 }
                 break;
 
-            case DBG_FUNC_MEMTEST:
-#ifdef SV_MEMMGR
-                DbgImpCheckMemory( pParam );
-#endif
-                break;
-
             case DBG_FUNC_XTORINFO:
                 DebugXTorInfo( (sal_Char*)pParam );
                 break;
 
-            case DBG_FUNC_MEMINFO:
-#ifdef SV_MEMMGR
-                DbgImpMemoryInfo( (sal_Char*)pParam );
-#endif
-                break;
-
             case DBG_FUNC_COREDUMP:
                 ImplCoreDump();
                 break;
@@ -1418,12 +1353,6 @@ void DbgXtor( DbgDataType* pDbgData, sal_uInt16 nAction, const void* pThis,
 {
     DebugData* pData = ImplGetDebugData();
 
-    // Verbindung zu Debug-Memory-Manager testen
-#ifdef SV_MEMMGR
-    if ( pData->aDbgData.nTestFlags & DBG_TEST_MEM_XTOR )
-        DbgImpCheckMemory();
-#endif
-
     // Schnell-Test
     if ( !(pData->aDbgData.nTestFlags & DBG_TEST_XTOR) )
         return;
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index ffd4ef48f93f..cb25dfdb105f 100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -137,87 +137,6 @@ static const sal_Char* pDbgHelpText[] =
 "DBG_XTOR is logged.\n",
 "\n",
 "\n",
-"Memory Test\n",
-"------------------------------------------\n",
-"\n",
-"--- Macros ---\n",
-"DBG_MEMTEST()\n",
-"Run the specified memory tests.\n",
-"\n",
-"DBG_MEMTEST_PTR( p )\n",
-"Runs the specified memory tests and validates the pointer that was "
-"passed if the pointer test is enabled.\n",
-"\n",
-"--- Options ---\n",
-"Initialize\n",
-"Allocated memory is initialized with 0x77 and free or freed memory "
-"is initialized with 0x33. This option has almost no impact on performance "
-"and should thus always be enabled during development. This will also "
-"make crashes more often reproducable.\n",
-"\n",
-"Overwrite\n",
-"This test check whether writes occur before or after the blocks. Before "
-"and after the block memory is initialized with 0x55. This option costs "
-"performance, but should be enabled once in a while to test for common "
-"memory overwrites (+-1 errors). This option should also be enabled if the "
-"program crashes in a new or delete operator.\n",
-"\n",
-"Free\n",
-"This checks whether writes occur in free memory. This option costs lots "
-" of performance and should thus only be used to test memory overwrites. "
-" This option should perhaps also be enabled when the program crashes "
-" in the new or delete operator.\n",
-"\n",
-"Pointer\n",
-"The pointer is tested with delete and DBG_MEMTEST_PTR() to see if it was "
-"created by new or SvMemAlloc(). When this option is enabled errors such as "
-"double deletes, deletes on stack objects or invalid pointers will be found. "
-"This option has an impact on performance and should therefor not be enabled "
-"all the time. However, testing should be done with this option enabled once "
-"in a while, because the memory manager does not always crash with delete and "
-"invalid pointers. This option should also be enabled if the program crashes "
-"in new or delete operators.\n",
-"\n",
-"Report\n",
-"At the end of the program a small statistic and memory that was not freed are "
-"output. Note: memory that is freed by global objects is also included in "
-"the leak list.\n",
-"\n",
-"Trace\n",
-"Allocating and freeing memory is logged.\n",
-"\n",
-"Leak report\n",
-"Produces under WNT at the end of the program a list of memory leaks with "
-"stack trace. Only blocks which were created inside Application::Execute() "
-"are included. When this option and Overwrite are both enabled a memory "
-"overwrite results in an attempt to output the stack where the block was "
-"created. The output is included in the log file after the error message.\n"
-"\n",
-"New/Delete\n",
-"Memory tests are performed on the entire memory with every new/delet. "
-"Warning: this option makes programs very slow and should only be enabled "
-"to track memory overwrites. Otherwise it is sufficient to enable "
-"seperate options because (if no leak is present) every detectable "
-"memory overwrite during run time should be found.\n",
-"\n",
-"Object Test\n",
-"Memory test are performed on the entire memory with every object test. "
-"Warning: this option makes programs very slow and should only be enabled "
-"to track memory overwrite. Otherwise it is sufficient to enable "
-"seperate options because (if no leak is present) every detectable "
-"memory overwrite during run time should be found.\n",
-"\n",
-"Windows 16-bit and debug tests\n",
-"Warning: when memory test are enabled (except for Initialize) memory with "
-"offset 0 is never (even not in case of >= 64KB) returned. If necessary the "
-"tests can be performed with 32-bit versions of the programs. To a certain "
-"extend it is sufficient to create 64KB - 64 bytes instead of 64KB because "
-"it will never come to a segment overflow.\n",
-"Memory and object test should only be enabled when only one SV application "
-"is running at one time. Otherwise uncontrolled errors may occur. In this "
-"case only the use of 32-bit programs can help."
-"\n",
-"\n",
 "\nOther tests and macros\n",
 "------------------------------------------\n",
 "\n",
@@ -541,17 +460,6 @@ private:
     CheckBox        maXtorTrace;
     GroupBox        maBox1;
 
-    CheckBox        maMemInit;
-    CheckBox        maMemOverwrite;
-    CheckBox        maMemOverwriteFree;
-    CheckBox        maMemPtr;
-    CheckBox        maMemReport;
-    CheckBox        maMemTrace;
-    CheckBox        maMemLeakReport;
-    CheckBox        maMemNewDel;
-    CheckBox        maMemXtor;
-    GroupBox        maBox2;
-
     CheckBox        maProf;
     CheckBox        maRes;
     CheckBox        maDialog;
@@ -754,16 +662,6 @@ DbgDialog::DbgDialog() :
     maXtorReport( this ),
     maXtorTrace( this ),
     maBox1( this ),
-    maMemInit( this ),
-    maMemOverwrite( this ),
-    maMemOverwriteFree( this ),
-    maMemPtr( this ),
-    maMemReport( this ),
-    maMemTrace( this ),
-    maMemLeakReport( this ),
-    maMemNewDel( this ),
-    maMemXtor( this ),
-    maBox2( this ),
     maProf( this ),
     maRes( this ),
     maDialog( this ),
@@ -849,94 +747,6 @@ DbgDialog::DbgDialog() :
     }
 
     {
-    maMemInit.Show();
-    maMemInit.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Initialize" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_INIT )
-        maMemInit.Check( sal_True );
-    maMemInit.SetPosSizePixel( LogicToPixel( Point( 10, 50 ), aAppMap ),
-                               aButtonSize );
-    }
-
-    {
-    maMemOverwrite.Show();
-    maMemOverwrite.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Overwrite" )) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_OVERWRITE )
-        maMemOverwrite.Check( sal_True );
-    maMemOverwrite.SetPosSizePixel( LogicToPixel( Point( 75, 50 ), aAppMap ),
-                                    aButtonSize );
-    }
-
-    {
-    maMemOverwriteFree.Show();
-    maMemOverwriteFree.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Free" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_OVERWRITEFREE )
-        maMemOverwriteFree.Check( sal_True );
-    maMemOverwriteFree.SetPosSizePixel( LogicToPixel( Point( 140, 50 ), aAppMap ),
-                                        aButtonSize );
-    }
-
-    {
-    maMemPtr.Show();
-    maMemPtr.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Pointer" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_POINTER )
-        maMemPtr.Check( sal_True );
-    maMemPtr.SetPosSizePixel( LogicToPixel( Point( 205, 50 ), aAppMap ),
-                              aButtonSize );
-    }
-
-    {
-    maMemReport.Show();
-    maMemReport.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Report" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_REPORT )
-        maMemReport.Check( sal_True );
-    maMemReport.SetPosSizePixel( LogicToPixel( Point( 270, 50 ), aAppMap ),
-                                 aButtonSize );
-    }
-
-    {
-    maMemTrace.Show();
-    maMemTrace.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Trace" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_TRACE )
-        maMemTrace.Check( sal_True );
-    maMemTrace.SetPosSizePixel( LogicToPixel( Point( 10, 65 ), aAppMap ),
-                                aButtonSize );
-    }
-
-    {
-    maMemLeakReport.Show();
-    maMemLeakReport.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Leak-Report" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_LEAKREPORT )
-        maMemLeakReport.Check( sal_True );
-    maMemLeakReport.SetPosSizePixel( LogicToPixel( Point( 75, 65 ), aAppMap ),
-                                     aButtonSize );
-    }
-
-    {
-    maMemNewDel.Show();
-    maMemNewDel.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~New/Delete" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_NEWDEL )
-        maMemNewDel.Check( sal_True );
-    maMemNewDel.SetPosSizePixel( LogicToPixel( Point( 140, 65 ), aAppMap ),
-                                 aButtonSize );
-    }
-
-    {
-    maMemXtor.Show();
-    maMemXtor.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "Ob~ject Test" ) ) );
-    if ( pData->nTestFlags & DBG_TEST_MEM_XTOR )
-        maMemXtor.Check( sal_True );
-    maMemXtor.SetPosSizePixel( LogicToPixel( Point( 205, 65 ), aAppMap ),
-                               aButtonSize );
-    }
-
-    {
-    maBox2.Show();
-    maBox2.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "Memory Tests" ) ) );
-    maBox2.SetPosSizePixel( LogicToPixel( Point( 5, 40 ), aAppMap ),
-                            LogicToPixel( Size( 330, 40 ), aAppMap ) );
-    }
-
-    {
     maProf.Show();
     maProf.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "~Profiling" ) ) );
     if ( pData->nTestFlags & DBG_TEST_PROFILING )
@@ -1222,33 +1032,6 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
         if ( maXtorTrace.IsChecked() )
             aData.nTestFlags |= DBG_TEST_XTOR_TRACE;
 
-        if ( maMemInit.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_INIT;
-
-        if ( maMemOverwrite.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_OVERWRITE;
-
-        if ( maMemOverwriteFree.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_OVERWRITEFREE;
-
-        if ( maMemPtr.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_POINTER;
-
-        if ( maMemReport.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_REPORT;
-
-        if ( maMemTrace.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_TRACE;
-
-        if ( maMemLeakReport.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_LEAKREPORT;
-
-        if ( maMemNewDel.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_NEWDEL;
-
-        if ( maMemXtor.IsChecked() )
-            aData.nTestFlags |= DBG_TEST_MEM_XTOR;
-
         if ( maProf.IsChecked() )
             aData.nTestFlags |= DBG_TEST_PROFILING;
 
@@ -1271,7 +1054,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
         DbgUpdateOslHook( &aData );
 
         DbgData* pData = DbgGetData();
-        #define IMMEDIATE_FLAGS (DBG_TEST_MEM_INIT | DBG_TEST_RESOURCE | DBG_TEST_DIALOG | DBG_TEST_BOLDAPPFONT)
+        #define IMMEDIATE_FLAGS (DBG_TEST_RESOURCE | DBG_TEST_DIALOG | DBG_TEST_BOLDAPPFONT)
         pData->nTestFlags &= ~IMMEDIATE_FLAGS;
         pData->nTestFlags |= aData.nTestFlags & IMMEDIATE_FLAGS;
         strncpy( pData->aInclClassFilter, aData.aInclClassFilter, sizeof( pData->aInclClassFilter ) );
@@ -1305,7 +1088,6 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
     {
         DbgInfoDialog aInfoDialog( this );
         aDbgInfoBuf[0] = '\0';
-        DbgMemInfo( aDbgInfoBuf );
         DbgXtorInfo( aDbgInfoBuf );
         XubString aInfoText( aDbgInfoBuf, RTL_TEXTENCODING_UTF8 );
         aInfoDialog.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "Debug InfoReport" ) ) );