diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-29 10:35:38 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-29 11:46:10 +0100 |
| commit | af1c0ef8d397b652a4b58b29fbd7cab1a0ab5840 (patch) | |
| tree | b52c86932c30cee2f6a682e29c2e27cb494e94a3 /desktop | |
| parent | 4613f593a83811e81520ae2f40f8c33870bdf2f6 (diff) | |
Introduce com.sun.star.frame.ControllerFactory singletons:
com.sun.star.frame.thePopupMenuControllerFactory
com.sun.star.frame.theStatusbarControllerFactory
com.sun.star.frame.theToolbarControllerFactory
To replace their single-instance service variants.
Change-Id: I00586d0d61e63f9482cb659071e88aa9cf02d5b5
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 88c7fbfd3926..82c03b4705fa 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -72,8 +72,7 @@ #include <com/sun/star/ui/UIElementFactoryManager.hpp> #include <com/sun/star/ui/WindowStateConfiguration.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> -#include <com/sun/star/frame/ToolbarControllerFactory.hpp> -#include <com/sun/star/frame/PopupMenuControllerFactory.hpp> +#include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/office/Quickstart.hpp> #include <toolkit/helper/vclunohelper.hxx> @@ -2199,7 +2198,7 @@ void Desktop::PreloadConfigurationData() // configuration file they also get preloaded! Reference< css::frame::XUIControllerRegistration > xPopupMenuControllerFactory = - css::frame::PopupMenuControllerFactory::create( xContext ); + css::frame::thePopupMenuControllerFactory::get( xContext ); try { xPopupMenuControllerFactory->hasController( |