diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-25 00:55:23 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-25 01:02:33 +0200 |
| commit | 954d7adb391e179e06d941eb31f8dcfe0bc4b298 (patch) | |
| tree | 60537db93548747ff2da8e8fbcaa7df3819b5f9d /framework | |
| parent | 12f11aa2ff0fd2ec8ecccf47501b9a6b1636b4ba (diff) | |
MenuBarManager: Pass the module identifier to the factory
Change-Id: I681054715e943791bddb4b33f01c903c78b717d7
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index f9e94bafa553..a1ac05c8111f 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -870,7 +870,7 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool ) bool bPopupMenu( false ); if ( !pMenuItemHandler->xPopupMenuController.is() && - m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() )) + m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) ) { bPopupMenu = CreatePopupMenuController( pMenuItemHandler ); } @@ -1220,7 +1220,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( m_xPopupMenuControllerFactory.is() && pPopup->GetItemCount() == 0 && - m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() ) + m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) ) { // Check if we have to create a popup menu for a uno based popup menu controller. @@ -1352,7 +1352,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF pItemHandler->aMenuItemURL = aItemCommand; if ( m_xPopupMenuControllerFactory.is() && - m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() )) + m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) ) { // Check if we have to create a popup menu for a uno based popup menu controller. // We have to set an empty popup menu into our menu structure so the controller also @@ -1959,7 +1959,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,boo // We have to set an empty popup menu into our menu structure so the controller also // works with inplace OLE. if ( m_xPopupMenuControllerFactory.is() && - m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() )) + m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) ) { VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu; PopupMenu* pCtlPopupMenu = static_cast<PopupMenu *>(pVCLXPopupMenu->GetMenu()); |