diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-31 20:55:58 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-31 20:55:58 +0200 |
commit | 2f44516d6c3fce6ebe372214ce4bfa11875bd3d1 (patch) | |
tree | cfbc6cf57fde9482b2dcab3194b49bc7c3dc2dd0 /sfx2 | |
parent | 6a1486fd2c446624351f34a00be099fbeba040d3 (diff) |
unusedcode: remove various classes
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/dispatch.hxx | 24 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 51 | ||||
-rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 55 |
3 files changed, 0 insertions, 130 deletions
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index ac2ec043fbb1..0ce4f2ba16c4 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -81,30 +81,6 @@ SV_DECL_PTRARR_DEL( SfxItemPtrArray, SfxPoolItemPtr, 4, 4 ) // fuer shell.cxx typedef SfxItemPtrArray SfxItemArray_Impl; -class SfxExecuteItem : public SfxItemPtrArray, public SfxPoolItem -{ - sal_uInt16 nSlot; - SfxCallMode eCall; - sal_uInt16 nModifier; -public: - sal_uInt16 GetSlot() const { return nSlot; } - sal_uInt16 GetModifier() const { return nModifier; } - void SetModifier( sal_uInt16 nModifierP ) { nModifier = nModifierP; } - SfxCallMode GetCallMode() const { return eCall; } - void SetCallMode( SfxCallMode eMode ) { eCall = eMode; } - virtual int operator==( const SfxPoolItem& ) const; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - SfxExecuteItem( - sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode, - const SfxPoolItem *pArg1, ... ); - SfxExecuteItem( - sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode ); - SfxExecuteItem( const SfxExecuteItem& ); -}; - -//========================================================================= - class SFX2_DLLPUBLIC SfxDispatcher { SfxDispatcher_Impl* pImp; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 58a2d0c25c4d..92a11be0de38 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1130,57 +1130,6 @@ const SfxSlot* SfxDispatcher::GetSlot( const String& rCommand ) } //-------------------------------------------------------------------- -int SfxExecuteItem::operator==( const SfxPoolItem& rItem ) const -{ - SfxExecuteItem& rArg = (SfxExecuteItem& )rItem; - sal_uInt16 nCount = Count(); - if( nCount != rArg.Count() ) - return sal_False; - while( nCount -- ) - if( *GetObject( nCount ) != *rArg.GetObject( nCount ) ) - return sal_False; - return eCall == rArg.eCall; -} - -//-------------------------------------------------------------------- -SfxPoolItem* SfxExecuteItem::Clone( SfxItemPool* ) const -{ - return new SfxExecuteItem( *this ); -} - -//-------------------------------------------------------------------- -SfxExecuteItem::SfxExecuteItem( const SfxExecuteItem& rArg ) - : SfxItemPtrArray(), SfxPoolItem( rArg ), nModifier( 0 ) -{ - eCall = rArg.eCall; - nSlot = rArg.nSlot; - sal_uInt16 nCount = rArg.Count(); - for( sal_uInt16 nPos = 0; nPos < nCount; nPos++ ) - Insert( rArg[ nPos ]->Clone(), nPos ); -} - -//-------------------------------------------------------------------- -SfxExecuteItem::SfxExecuteItem( - sal_uInt16 nWhichId, sal_uInt16 nSlotP, SfxCallMode eModeP, - const SfxPoolItem* pArg1, ... ) : - SfxPoolItem( nWhichId ), nSlot( nSlotP ), eCall( eModeP ), nModifier( 0 ) -{ - va_list pVarArgs; - va_start( pVarArgs, pArg1 ); - for ( const SfxPoolItem *pArg = pArg1; pArg; - pArg = va_arg( pVarArgs, const SfxPoolItem* ) ) - Insert( pArg->Clone(), Count() ); - va_end(pVarArgs); -} - -//-------------------------------------------------------------------- -SfxExecuteItem::SfxExecuteItem( - sal_uInt16 nWhichId, sal_uInt16 nSlotP, SfxCallMode eModeP ) - : SfxPoolItem( nWhichId ), nSlot( nSlotP ), eCall( eModeP ), nModifier( 0 ) -{ -} - -//-------------------------------------------------------------------- const SfxPoolItem* SfxDispatcher::Execute( sal_uInt16 nSlot, SfxCallMode nCall, diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 20547592b1b5..b33578971b8e 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -77,51 +77,6 @@ using namespace ::com::sun::star::util; //==================================================================== -class SfxEnumMenu: public PopupMenu -{ - sal_uInt16 nSlot; - SfxEnumItem *pItem; - SfxBindings* pBindings; - -protected: - virtual void Select(); - -public: - SfxEnumMenu( sal_uInt16 nSlot, SfxBindings* pBind, const SfxEnumItem &rItem ); - ~SfxEnumMenu(); -}; - -//========================================================================= - -SfxEnumMenu::SfxEnumMenu( sal_uInt16 nSlotId, SfxBindings* pBind, const SfxEnumItem &rItem ): - nSlot( nSlotId ), - pItem( (SfxEnumItem*) rItem.Clone() ), - pBindings( pBind ) -{ - for ( sal_uInt16 nVal = 0; nVal < pItem->GetValueCount(); ++nVal ) - InsertItem( nVal+1, pItem->GetValueTextByPos(nVal) ); - CheckItem( pItem->GetValue() + 1, sal_True ); -} - -//------------------------------------------------------------------------- - -SfxEnumMenu::~SfxEnumMenu() -{ - delete pItem; -} - -//------------------------------------------------------------------------- - -void SfxEnumMenu::Select() -{ - pItem->SetValue( GetCurItemId()-1 ); - pBindings->GetDispatcher()->Execute( nSlot, - SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, - pItem, 0L, 0L ); -} - -//-------------------------------------------------------------------- - // binds the instance to the specified id and assignes the title void SfxMenuControl::Bind( @@ -291,16 +246,6 @@ void SfxMenuControl::StateChanged pOwnMenu->SetItemText( GetId(), aStr ); } -#ifdef enum_item_menu_ok - else if ( aType == TYPE(SfxEnumItem) ) - { - DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST, - "SfxEnumItem not allowed for SID_OBJECTMENUx" ); - pOwnMenu->GetMenu().ChangePopupMenu( GetId(), &GetBindings(), - new SfxEnumMenu( GetId(), *(const SfxEnumItem*)pState ) ); - } -#endif - pOwnMenu->CheckItem( GetId(), bCheck ); } |