diff options
Diffstat (limited to 'framework/source/classes/menumanager.cxx')
-rw-r--r-- | framework/source/classes/menumanager.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index b4befafdefd8..1fc665b4b603 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -120,7 +120,7 @@ const char UNO_COMMAND[] = ".uno:"; MenuManager::MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - REFERENCE< XFRAME >& rFrame, AbstractMenu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) + REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) : ThreadHelpBase( &Application::GetSolarMutex() ), mxServiceFactory(xServiceFactory) @@ -465,7 +465,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM } -void MenuManager::UpdateSpecialFileMenu( AbstractMenu* pMenu ) +void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) { // update picklist Sequence< Sequence< PropertyValue > > aHistoryList = SvtHistoryOptions().GetList( ePICKLIST ); @@ -631,7 +631,7 @@ void MenuManager::UpdateSpecialFileMenu( AbstractMenu* pMenu ) } } -void MenuManager::UpdateSpecialWindowMenu( AbstractMenu* pMenu,const Reference< XMultiServiceFactory >& xServiceFactory,framework::IMutex& _rMutex ) +void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiServiceFactory >& xServiceFactory,framework::IMutex& _rMutex ) { // update window list ::std::vector< ::rtl::OUString > aNewWindowListVector; @@ -745,7 +745,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, // vcl handler //_________________________________________________________________________________________________________________ -IMPL_LINK( MenuManager, Activate, AbstractMenu *, pMenu ) +IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) { if ( pMenu == m_pVCLMenu ) { @@ -848,7 +848,7 @@ IMPL_LINK( MenuManager, Activate, AbstractMenu *, pMenu ) } -IMPL_LINK( MenuManager, Deactivate, AbstractMenu *, pMenu ) +IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu ) { if ( pMenu == m_pVCLMenu ) m_bActive = sal_False; @@ -857,7 +857,7 @@ IMPL_LINK( MenuManager, Deactivate, AbstractMenu *, pMenu ) } -IMPL_LINK( MenuManager, Select, AbstractMenu *, pMenu ) +IMPL_LINK( MenuManager, Select, Menu *, pMenu ) { URL aTargetURL; Sequence<PropertyValue> aArgs; @@ -959,7 +959,7 @@ void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCo m_aMenuItemHandlerVector.push_back( pMenuItemHandler ); } -sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand, AbstractMenu* _pMenu,sal_uInt16 _nIndex) const +sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const { sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex ); @@ -973,7 +973,7 @@ sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand, Abstract } return nItemId; } -void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, AbstractMenu* _pMenu,sal_Bool bShowMenuImages) +void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,sal_Bool bShowMenuImages) { AddonsOptions aAddonOptions; |