diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-29 18:58:18 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-30 10:48:25 +0100 |
| commit | 19e16083c61c46a9d014b2db79e70194c14dec64 (patch) | |
| tree | 39a4ca4fdee24e34474eab1ed2da0d317d853ab7 /sfx2 | |
| parent | a8f9feb9c13722509d052583e252e875638aaf1b (diff) | |
Introduce com.sun.star.ui.theModuleUIConfigurationManagerSupplier singleton.
Change-Id: I7b503e5d49865c9ff287bf72eaff1995ce871790
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/imagemgr.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/sidebar/CommandInfoProvider.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 5a6b6c1823f4..577a8d424e5b 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -441,7 +441,7 @@ #include <com/sun/star/ui/ContextChangeEventObject.hpp> #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> #include <com/sun/star/ui/ImageType.hpp> -#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/UIConfigurationManager.hpp> #include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/ui/UIElementType.hpp> diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 7b59f9e95a6e..8444682ac3c5 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> @@ -170,7 +170,7 @@ Image SAL_CALL GetImage( if ( !xModuleCfgMgrSupplier.is() ) { - xModuleCfgMgrSupplier = ModuleUIConfigurationManagerSupplier::create( + xModuleCfgMgrSupplier = theModuleUIConfigurationManagerSupplier::get( ::comphelper::getProcessComponentContext() ); m_xModuleCfgMgrSupplier = xModuleCfgMgrSupplier; diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index 61d1b62fcaea..2001e9e84457 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> using namespace css; using namespace cssu; @@ -198,7 +198,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAccelerat { try { - Reference<ui::XModuleUIConfigurationManagerSupplier> xSupplier = ui::ModuleUIConfigurationManagerSupplier::create(mxContext); + Reference<ui::XModuleUIConfigurationManagerSupplier> xSupplier = ui::theModuleUIConfigurationManagerSupplier::get(mxContext); Reference<ui::XUIConfigurationManager> xManager ( xSupplier->getUIConfigurationManager(GetModuleIdentifier())); if (xManager.is()) |