diff options
| author | Noel Grandin <noel@peralex.com> | 2012-12-10 16:26:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2012-12-13 05:20:58 +0200 |
| commit | 9779ae8bdeffe1c296803dffefa0d69b0fb8f975 (patch) | |
| tree | 4e7cf6fa46922ffbe915f820842866499814337f /framework/source/uielement/toolbarsmenucontroller.cxx | |
| parent | e52a5e298b55125534cd8548ed4c1f8b694bfef6 (diff) | |
fdo#46808, use service constructor for ui::
::ModuleUIConfigurationManagerSupplier
Change-Id: I06e8b3ef9b525da014a2bb7702587d360779aebc
Diffstat (limited to 'framework/source/uielement/toolbarsmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/toolbarsmenucontroller.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 43a4517f6f97..34520aa830ec 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/XUIElementSettings.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/UIElementType.hpp> @@ -837,10 +837,8 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume aModuleIdentifier = xModuleManager->identify( m_xFrame ); xPersistentWindowStateSupplier->getByName( aModuleIdentifier ) >>= m_xPersistentWindowState; - Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier; - if ( m_xServiceManager.is() ) - xModuleCfgSupplier = Reference< XModuleUIConfigurationManagerSupplier >( - m_xServiceManager->createInstance( SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ), UNO_QUERY ); + Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = + ModuleUIConfigurationManagerSupplier::create( comphelper::getComponentContext(m_xServiceManager) ); m_xModuleCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier ); Reference< XController > xController = m_xFrame->getController(); |