diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-09-20 01:04:50 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-17 23:22:15 +0200 |
| commit | 8b7c82bce6f8d1b258576485467721d547601a44 (patch) | |
| tree | 467d16f513528ce869c8c60003fe5f52cbe9e9a5 /framework | |
| parent | ca49de59a9a7206e13cd9a78238158df48b53953 (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>
(cherry picked from commit f30206f63dcf6fe41a216a3d708dfd05cc2b83a9)
Diffstat (limited to 'framework')
| -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 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 ); |