framework/source/uielement/menubarmanager.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 94a7a71b070d3911b39d1026ba266768b71ba8a6
Author: Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Sun Sep 6 22:15:16 2020 +0300
Commit: Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Mon Sep 7 00:19:05 2020 +0200
MenuBarManager: Actually use xPopupMenuDispatchProvider
i.e. restore the fix for i#65734/i#75851, which for some
reason was disabled in 3c471fa5480d58e867e05a1ef474a23aef94b07d.
This can be tested by inserting chart into Writer or Calc, and
looking at the File menu. Given that this menu is merged from
the container app, it makes sense to use its dispatch provider
for everything, not just for a few commands hardcoded in
CommandDispatchContainer::getDispatchForURL of chart2.
Change-Id: I03f233a84249284354ea709d8aa7c950390294e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102137
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index f72e5471d36a..21817bd36b93 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1043,7 +1043,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const
Reference< XFrame >& rF
}
MenuBarManager* pSubMenuManager = new MenuBarManager(
m_xContext, rFrame, m_xURLTransformer,
- rDispatchProvider, aModuleIdentifier, pPopup, false,
m_bHasMenuBar );
+ xPopupMenuDispatchProvider, aModuleIdentifier, pPopup,
false, m_bHasMenuBar );
AddMenu(pSubMenuManager, aItemCommand, nItemId);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
