diff options
| author | Tsutomu Uchino <hanya@apache.org> | 2014-05-16 12:48:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-19 13:28:17 +0100 |
| commit | 61ce018658cb673debae3d29a747252f6bc692ff (patch) | |
| tree | 5919c957bcee23f5971a5f358aeae869e36f6d00 /sfx2 | |
| parent | 39669d3244e3859471e665cf6afc754b6aca634e (diff) | |
Resolves: #i86528# use the module manager to identify the context...
for addons menu merging
(cherry picked from commit 2aac0070dbef6c1ad7eeccf7d4015cdcbffe067e)
Conflicts:
framework/source/classes/menumanager.cxx
framework/source/fwe/classes/addonmenu.cxx
framework/source/uielement/menubarmanager.cxx
include/framework/addonmenu.hxx
Change-Id: I3b606671db3a4c6ba8ed2b850e01e1ac91db7581
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 8795ee402b99..76552d78dbdd 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -290,20 +290,17 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( pSVMenu->IsMenuBar() ) { + Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); sal_uInt16 nPos = pSVMenu->GetItemPos( SID_MDIWINDOWLIST ); if ( nPos != MENU_ITEM_NOTFOUND && xFrame.is() ) { // Retrieve addon popup menus and add them to our menu bar - Reference< com::sun::star::frame::XModel > xModel; - Reference< com::sun::star::frame::XController > xController( xFrame->getController(), UNO_QUERY ); - if ( xController.is() ) - xModel = Reference< com::sun::star::frame::XModel >( xController->getModel(), UNO_QUERY ); - framework::AddonMenuManager::MergeAddonPopupMenus( xFrame, xModel, nPos, (MenuBar *)pSVMenu ); + framework::AddonMenuManager::MergeAddonPopupMenus( xFrame, nPos, (MenuBar *)pSVMenu, xContext ); } // Merge the Add-Ons help menu items into the Office help menu if ( xFrame.is() ) - framework::AddonMenuManager::MergeAddonHelpMenu( xFrame, (MenuBar *)pSVMenu ); + framework::AddonMenuManager::MergeAddonHelpMenu( xFrame, (MenuBar *)pSVMenu, xContext ); // Set addon menu pointer here to avoid problems. When accessibility is enabled, the whole menu // is created immediately! @@ -747,7 +744,8 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) PopupMenu* pAddonMenu = NULL; try { - pAddonMenu = framework::AddonMenuManager::CreateAddonMenu( xFrame ); + Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + pAddonMenu = framework::AddonMenuManager::CreateAddonMenu(xFrame, xContext); } catch ( const ::com::sun::star::lang::WrappedTargetException& ) { |