diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-29 10:51:46 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-29 11:46:10 +0100 |
| commit | e9a23fd78c7506cc28cdd4619cdb623813e36c61 (patch) | |
| tree | f1e38399354c3f09382c5559bfdd80126a7e9c27 /framework | |
| parent | 43b84c96629e78e17e6a1e51e4c482887197036f (diff) | |
Introduce com.sun.star.ui.theUIElementFactoryManager singleton.
To replace single-instance com.sun.star.ui.UIElementFactoryManager
service.
Change-Id: I4262909c4396e3907d271a56696a06903168a58d
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/pch/precompiled_fwk.hxx | 2 | ||||
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 4 | ||||
| -rw-r--r-- | framework/util/fwk.component | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index db2efda756a5..c88be55254d1 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -205,7 +205,7 @@ #include <com/sun/star/ui/ModuleAcceleratorConfiguration.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManager.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/UIElementFactoryManager.hpp> +#include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/WindowStateConfiguration.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 7dc9bb302281..e0d8746b73ab 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -49,7 +49,7 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/WindowStateConfiguration.hpp> -#include <com/sun/star/ui/UIElementFactoryManager.hpp> +#include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/frame/LayoutManagerEvents.hpp> @@ -123,7 +123,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : , m_bMenuBarCloser( false ) , m_pInplaceMenuBar( NULL ) , m_xModuleManager( ModuleManager::create( xContext )) - , m_xUIElementFactoryManager( ui::UIElementFactoryManager::create(xContext) ) + , m_xUIElementFactoryManager( ui::theUIElementFactoryManager::get(xContext) ) , m_xPersistentWindowStateSupplier( ui::WindowStateConfiguration::create( xContext ) ) , m_pGlobalSettings( 0 ) , m_aListenerContainer( m_aLock.getShareableOslMutex() ) diff --git a/framework/util/fwk.component b/framework/util/fwk.component index 3a1cd49485b9..ea55f649eaa3 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -147,6 +147,7 @@ </implementation> <implementation name="com.sun.star.comp.framework.UIElementFactoryManager"> <service name="com.sun.star.ui.UIElementFactoryManager"/> + <singleton name="com.sun.star.ui.theUIElementFactoryManager"/> </implementation> <implementation name="com.sun.star.comp.framework.URLTransformer" constructor="com_sun_star_comp_framework_URLTransformer_get_implementation"> |