From c5301f215fec9016c3a75ff4a6a0c6c22f152718 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Wed, 12 Aug 2020 23:36:52 +0300 Subject: Replace MenuToolbarController with the usual approach for menu buttons i.e. ResourceMenuController + GenericPopupToolbarController. (Decl. of both isn't available in a header file, so they are instantiated via the service manager for now. This is a bit weird for something from the same module, but should not make any difference in practice.) Change-Id: Ia3fc7ba82b0f6e1a43aa7b5e56e2cff7e039d877 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100725 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky --- framework/source/uielement/toolbarmanager.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'framework/source/uielement/toolbarmanager.cxx') diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5aae377c4066..e3d8a20f8b4b 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -759,7 +759,8 @@ void ToolBarManager::CreateControllers() } else if ( aCommandURL.startsWith( "private:resource/menubar/" ) ) { - xController.set( new MenuToolbarController ); + xController.set( m_xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.comp.framework.GenericPopupToolbarController", m_xContext ), UNO_QUERY ); } else { -- cgit