diff options
| author | Noel Grandin <noel@peralex.com> | 2012-12-11 11:27:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2012-12-13 05:20:58 +0200 |
| commit | b552f521f6bbf917ae41ccfcddeb498c75c824e3 (patch) | |
| tree | ae21fbb700814e8b31bca384f47f68b0a5e71145 /desktop | |
| parent | bb8900baaaaa489442a5bd805bb42d43cd6fc152 (diff) | |
fdo#46808, Adapt ui::UIElementFactoryManager UNO service to new style
Required creating a new merged interface.
Change-Id: I12be54e7e4c0614a31a04715342aa244d1687c42
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c78c76b2214d..26d79eccfcfb 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -62,7 +62,7 @@ #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/frame/UICommandDescription.hpp> -#include <com/sun/star/ui/XUIElementFactoryRegistration.hpp> +#include <com/sun/star/ui/UIElementFactoryManager.hpp> #include <com/sun/star/ui/WindowStateConfiguration.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> @@ -2137,19 +2137,13 @@ void Desktop::PreloadConfigurationData() // preload user interface element factories Sequence< Sequence< css::beans::PropertyValue > > aSeqSeqPropValue; - Reference< ::com::sun::star::ui::XUIElementFactoryRegistration > xUIElementFactory( - rFactory->createInstance( - rtl::OUString( "com.sun.star.ui.UIElementFactoryManager" )), - UNO_QUERY ); - if ( xUIElementFactory.is() ) + Reference< XUIElementFactoryManager > xUIElementFactory = UIElementFactoryManager::create( xContext ); + try + { + aSeqSeqPropValue = xUIElementFactory->getRegisteredFactories(); + } + catch ( const ::com::sun::star::uno::Exception& ) { - try - { - aSeqSeqPropValue = xUIElementFactory->getRegisteredFactories(); - } - catch ( const ::com::sun::star::uno::Exception& ) - { - } } // preload popup menu controller factories. As all controllers are in the same |