diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-02 16:53:49 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-06 12:03:28 +0100 |
commit | 4ff873bda2a3af12e5c4848843ea6b7d9592bb6b (patch) | |
tree | df09b0860f9ab6db4f6a1f49d554f6e67848acab /framework | |
parent | 813b0f60e86de5e0ebf678691a9ff405e293bf86 (diff) |
Introduce com.sun.star.ui.theWindowStateConfiguration singleton.
Change-Id: I50861ac8952d54cb1a45846ea72a2ecac4f83409
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/source/uielement/toolbarsmenucontroller.cxx | 4 | ||||
-rw-r--r-- | framework/util/fwk.component | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 2452b626b87c..ed9ceea50491 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -207,7 +207,7 @@ #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.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/theWindowStateConfiguration.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XStatusbarItem.hdl> #include <com/sun/star/ui/XUIConfiguration.hpp> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index ce5d1346e913..906b1aa795e7 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #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/theWindowStateConfiguration.hpp> #include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -124,7 +124,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : , m_pInplaceMenuBar( NULL ) , m_xModuleManager( ModuleManager::create( xContext )) , m_xUIElementFactoryManager( ui::theUIElementFactoryManager::get(xContext) ) - , m_xPersistentWindowStateSupplier( ui::WindowStateConfiguration::create( xContext ) ) + , m_xPersistentWindowStateSupplier( ui::theWindowStateConfiguration::get( xContext ) ) , m_pGlobalSettings( 0 ) , m_aListenerContainer( m_aLock.getShareableOslMutex() ) , m_pToolbarManager( 0 ) diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 9230df866de7..9553572cf291 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #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/theWindowStateConfiguration.hpp> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> @@ -820,7 +820,7 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume if ( m_bInitialized ) { Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext ); - Reference< XNameAccess > xPersistentWindowStateSupplier = ::com::sun::star::ui::WindowStateConfiguration::create( m_xContext ); + Reference< XNameAccess > xPersistentWindowStateSupplier = ::com::sun::star::ui::theWindowStateConfiguration::get( m_xContext ); // Retrieve persistent window state reference for our module OUString aModuleIdentifier; diff --git a/framework/util/fwk.component b/framework/util/fwk.component index 463a3287c827..494886648ad9 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -169,6 +169,7 @@ </implementation> <implementation name="com.sun.star.comp.framework.WindowStateConfiguration"> <service name="com.sun.star.ui.WindowStateConfiguration"/> + <singleton name="com.sun.star.ui.theWindowStateConfiguration"/> </implementation> <implementation name="com.sun.star.comp.framework.jobs.JobDispatch" constructor="com_sun_star_comp_framework_jobs_JobDispatch_get_implementation"> |