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 /sfx2/source | |
| 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 'sfx2/source')
| -rw-r--r-- | sfx2/source/sidebar/ControllerFactory.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 90e202ca9232..3a6e294246e5 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/ToolbarControllerFactory.hpp> +#include <com/sun/star/frame/theToolbarControllerFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <framework/sfxhelperfunctions.hxx> @@ -147,7 +147,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBarController( try { Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); - Reference<frame::XUIControllerFactory> xFactory = frame::ToolbarControllerFactory::create( xContext ); + Reference<frame::XUIControllerFactory> xFactory = frame::theToolbarControllerFactory::get( xContext ); OUString sModuleName (Tools::GetModuleName(rxFrame)); if (xFactory.is() && xFactory->hasController(rsCommandName, sModuleName)) |