From 8b7c82bce6f8d1b258576485467721d547601a44 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sun, 20 Sep 2015 01:04:50 +0300 Subject: tdf#76197 Make OfficeMenuBar work again in the start center Regression of 46666a7720e18238b926531a7082dbb8bc524889. The code in MenuBarManager::FillMenuManager merges the addon menu before .uno:WindowList, which doesn't exist in the start center since that commit. As a last resort, let's also check for .uno:HelpMenu (assuming that it's never placed before the Window menu). Change-Id: If45eebe4351c40d8ed69daba527844ffc02e8458 Reviewed-on: https://gerrit.libreoffice.org/18729 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky (cherry picked from commit f30206f63dcf6fe41a216a3d708dfd05cc2b83a9) --- framework/source/uielement/menubarmanager.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'framework') diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index ad424fdc22c2..62400e469910 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1138,7 +1138,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { sal_uInt16 nItemId = pMenu->GetItemId( nPos ); OUString aCommand = pMenu->GetItemCommand( nItemId ); - if ( nItemId == SID_MDIWINDOWLIST || aCommand == aSpecialWindowCommand) + if ( nItemId == SID_MDIWINDOWLIST || aCommand == aSpecialWindowCommand || + nItemId == SID_HELPMENU || aCommand == aCmdHelpMenu ) { // Retrieve addon popup menus and add them to our menu bar framework::AddonMenuManager::MergeAddonPopupMenus( rFrame, nPos, static_cast(pMenu), m_xContext ); -- cgit