diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-09-20 01:04:50 +0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-20 21:46:37 +0000 |
| commit | 9f6f86805e543be6e76ff22496663ddc68669ce5 (patch) | |
| tree | 7c695e19cce4611fce7cc8f1fde81849fa00da05 | |
| parent | 7a1b2ca03e4d84fc687f9a931bb511e761598556 (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.cxx | 3 |
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 ); |