diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-09-07 11:59:25 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-09-07 15:10:31 +0200 |
| commit | f1a7b8275e9c301bbfa3a7a0df3a5209ca3cff62 (patch) | |
| tree | e8aedd7c5968babb590c3e2e7bf34d82943666ba /framework/inc | |
| parent | 00cffc20e40b2412c7e9867eed24c9834504e24f (diff) | |
Pass correct module id and dispatch provider to the window menu
This matters in a merged menu bar (e.g. insert chart), where the
Window menu belongs to the container rather than to the embedded
object. (Same as for the File menu, see also commit
94a7a71b070d3911b39d1026ba266768b71ba8a6 - "MenuBarManager:
Actually use xPopupMenuDispatchProvider".)
Change-Id: Ia502674b778554378546f5629ea44bbb17c830ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102158
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 67f5d95dd87c..9cb47eedc7d3 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -162,7 +162,9 @@ class MenuBarManager final : static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const OUString& aModuleIdentifier ); MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId ); - bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); + bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler, + const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, + const OUString& rModuleIdentifier ); void AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId); sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; void SetHdl(); |