summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-25 09:40:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-25 09:42:07 +0100
commit005f5d443e432130b902e1c78283c5f57f34d2b5 (patch)
tree6eb3f4607ffd07d06f197de6760201af07d9589c /sfx2
parent01f5362e7982cc1e5b8c9fa7216c892667971737 (diff)
remove freshly unused methods
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx3
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx3
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx1
-rw-r--r--sfx2/source/control/dispatch.cxx47
-rw-r--r--sfx2/source/menu/mnuitem.cxx16
-rw-r--r--sfx2/source/menu/mnumgr.cxx8
6 files changed, 0 insertions, 78 deletions
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 9a0b4f96e62f..ac2ec043fbb1 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -140,9 +140,6 @@ friend class SfxHelp;
void _Execute( SfxShell &rShell, const SfxSlot &rSlot,
SfxRequest &rReq,
SfxCallMode eCall = SFX_CALLMODE_STANDARD);
- const SfxPoolItem* _Execute( sal_uInt16 nSlot, SfxCallMode eCall,
- va_list pArgs, const SfxPoolItem *pArg1 );
-
#endif
protected:
void FlushImpl();
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 49051160d761..62ebce679ed4 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -85,12 +85,9 @@ class SfxUnoMenuControl : public SfxMenuControl
SfxUnoControllerItem* pUnoCtrl;
public:
SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
- SfxBindings&, SfxVirtualMenu* );
- SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
const String&,
SfxBindings&, SfxVirtualMenu* );
~SfxUnoMenuControl();
- void Select();
};
typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & );
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 58d412b35408..6b65fe939751 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -89,7 +89,6 @@ public:
class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager
{
private:
- DECL_LINK( SelectHdl, void * );
Menu* pSVMenu;
// when #i107205 gets fixed this one should be superfluous.
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 0b0b7c4cfcfe..58a2d0c25c4d 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1333,53 +1333,6 @@ const SfxPoolItem* SfxDispatcher::Execute
}
//--------------------------------------------------------------------
-const SfxPoolItem* SfxDispatcher::_Execute
-(
- sal_uInt16 nSlot, // the Id of the executing function
- SfxCallMode eCall, // SFX_CALLMODE_SYNCRHON, ..._ASYNCHRON or
- //..._SLOT
- va_list pVarArgs, // Parameter list from the 2nd parameter
- const SfxPoolItem* pArg1 // First parameter
-)
-
-/* [Description]
-
- Method to excecute a <SfxSlot>s over the Slot-Id.
-
- [Return value]
-
- const SfxPoolItem* Pointer to the SfxPoolItem valid to the next run
- though the Message-Loop, which contains the return
- value.
-
- Or a NULL-Pointer, when the function was not
- executed (for example canceled by the user).
-*/
-
-{
- if ( IsLocked(nSlot) )
- return 0;
-
- SfxShell *pShell = 0;
- const SfxSlot *pSlot = 0;
- if ( GetShellAndSlot_Impl( nSlot, &pShell, &pSlot, sal_False,
- SFX_CALLMODE_MODAL==(eCall&SFX_CALLMODE_MODAL) ) )
- {
- SfxAllItemSet aSet( pShell->GetPool() );
-
- for ( const SfxPoolItem *pArg = pArg1;
- pArg;
- pArg = va_arg( pVarArgs, const SfxPoolItem* ) )
- MappedPut_Impl( aSet, *pArg );
-
- SfxRequest aReq( nSlot, eCall, aSet );
- _Execute( *pShell, *pSlot, aReq, eCall );
- return aReq.GetReturnValue();
- }
- return 0;
-}
-
-//--------------------------------------------------------------------
const SfxPoolItem* SfxDispatcher::Execute
(
sal_uInt16 nSlot, // the Id of the executing function
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 560f51af4a5c..20547592b1b5 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -469,17 +469,6 @@ SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, rBindings, pVirt);
}
-SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, sal_uInt16 nSlotId,
- Menu& rMenu, SfxBindings& rBindings, SfxVirtualMenu* pVirt )
- : SfxMenuControl( nSlotId, rBindings )
-{
- Bind( pVirt, nSlotId, rMenu.GetItemText(nSlotId), rBindings);
- UnBind();
- pUnoCtrl = new SfxUnoControllerItem( this, rBindings, rCmd );
- pUnoCtrl->acquire();
- pUnoCtrl->GetNewDispatch();
-}
-
SfxUnoMenuControl::SfxUnoMenuControl(
const String& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/,
const String& rItemText,
@@ -499,9 +488,4 @@ SfxUnoMenuControl::~SfxUnoMenuControl()
pUnoCtrl->release();
}
-void SfxUnoMenuControl::Select()
-{
- pUnoCtrl->Execute();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index fc42a3e71e68..3bc9252d14da 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -307,14 +307,6 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
return nVal;
}
-//--------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
-{
- return 1;
-}
-IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
-
//-------------------------------------------------------------------------
SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )