summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-09-20 01:04:50 +0300
committerJan Holesovsky <kendy@collabora.com>2015-09-20 21:45:48 +0000
commitf30206f63dcf6fe41a216a3d708dfd05cc2b83a9 (patch)
tree3dd2003331975e5f42944116c3d68a69ac0a8787
parent7335925d4bedb3478b5c720d6a815ab15c8f2f66 (diff)
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 <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
1 files changed, 2 insertions, 1 deletions
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<MenuBar *>(pMenu), m_xContext );