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 /svtools | |
parent | a8f9feb9c13722509d052583e252e875638aaf1b (diff) |
Introduce com.sun.star.ui.theModuleUIConfigurationManagerSupplier singleton.
Change-Id: I7b503e5d49865c9ff287bf72eaff1995ce871790
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/pch/precompiled_svt.hxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/acceleratorexecute.cxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/contextmenuhelper.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index cb98da32a284..d5177e45a9a0 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -221,7 +221,7 @@ #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.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/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp> diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 3d83a9b958fa..92237e2a0f85 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/KeyModifier.hpp> @@ -381,7 +381,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st { return css::uno::Reference< css::ui::XAcceleratorConfiguration >(); } css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUISupplier( - css::ui::ModuleUIConfigurationManagerSupplier::create(rxContext) ); + css::ui::theModuleUIConfigurationManagerSupplier::get(rxContext) ); css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg; try diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 613266580668..48b10b395b0b 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManager.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/frame/theUICommandDescription.hpp> #include <com/sun/star/util/URLTransformer.hpp> @@ -417,7 +417,7 @@ ContextMenuHelper::associateUIConfigurationManagers() aModuleId = xModuleManager->identify( xFrame ); uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier( - ui::ModuleUIConfigurationManagerSupplier::create( + ui::theModuleUIConfigurationManagerSupplier::get( ::comphelper::getProcessComponentContext() ) ); uno::Reference< ui::XUIConfigurationManager > xUICfgMgr( xModuleCfgMgrSupplier->getUIConfigurationManager( aModuleId )); |