summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-09-20 01:04:50 +0300
committerAndras Timar <andras.timar@collabora.com>2015-10-02 14:58:30 +0200
commit69caf9c8d2e9eb8a981bfef3c777b8d13a9c321c (patch)
treed349d53f4541191bbdb98341714eaee4bb7043d5
parentc82283fde7f66f7480d671423aec70f5de3d3119 (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/18730 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 72c7ff0cc06b..300e0d2fe313 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1185,7 +1185,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 );