summaryrefslogtreecommitdiff
path: root/sfx2/source/menu
diff options
context:
space:
mode:
authorMarcel Metz <mmetz@adrian-broher.net>2012-01-10 07:19:46 +0100
committerDavid Tardon <dtardon@redhat.com>2012-01-10 07:23:04 +0100
commit1efa072b558d5b2aee03c658c4a781654985ba2b (patch)
tree70dd5e2024e1c109345ca0e31fd252e8a25914b3 /sfx2/source/menu
parent05c51d5dfb58549e5bf26cb5c8b9b4f0083dca25 (diff)
Remove cruft in debug tools
Diffstat (limited to 'sfx2/source/menu')
-rw-r--r--sfx2/source/menu/mnuitem.cxx8
-rw-r--r--sfx2/source/menu/mnumgr.cxx5
-rw-r--r--sfx2/source/menu/virtmenu.cxx13
3 files changed, 0 insertions, 26 deletions
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);