diff options
| author | Noel Grandin <noel@peralex.com> | 2012-12-11 17:18:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2012-12-21 09:12:07 +0200 |
| commit | e93a0018871ebea4da1959c72c06f3c7f4dc7b27 (patch) | |
| tree | 3f9b5b2dcde5d428e182966ace4a641aafe231c4 /desktop | |
| parent | ecae523d9603eaf7ff0acc98682576813e50c94a (diff) | |
fdo#46808, Adapt frame::PopupMenuControllerFactory UNO service to new style
Required creating a new merged interface.
The service interface is going to be shared by some other services,
which is why it's name is != the service name.
Change-Id: I9af3c27b367807147a0052fb6fa4e42eb1ad32de
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a83296f95e03..493f19065491 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/frame/GlobalEventBroadcaster.hpp> #include <com/sun/star/frame/XSessionManagerListener.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp> +#include <com/sun/star/frame/PopupMenuControllerFactory.hpp> #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> #include <com/sun/star/configuration/CorruptedConfigurationException.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> @@ -2149,21 +2150,16 @@ void Desktop::PreloadConfigurationData() // preload popup menu controller factories. As all controllers are in the same // configuration file they also get preloaded! - Reference< ::com::sun::star::frame::XUIControllerRegistration > xPopupMenuControllerFactory( - rFactory->createInstance( - rtl::OUString( "com.sun.star.frame.PopupMenuControllerFactory" )), - UNO_QUERY ); - if ( xPopupMenuControllerFactory.is() ) + Reference< css::frame::XToolbarControllerFactory > xPopupMenuControllerFactory = + css::frame::PopupMenuControllerFactory::create( xContext ); + try + { + xPopupMenuControllerFactory->hasController( + rtl::OUString( ".uno:CharFontName" ), + OUString() ); + } + catch ( const ::com::sun::star::uno::Exception& ) { - try - { - xPopupMenuControllerFactory->hasController( - rtl::OUString( ".uno:CharFontName" ), - OUString() ); - } - catch ( const ::com::sun::star::uno::Exception& ) - { - } } // preload filter configuration @@ -2207,8 +2203,6 @@ void Desktop::OpenClients() const CommandLineArgs& rArgs = GetCommandLineArgs(); SvtInternalOptions aInternalOptions; - Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory(); - if (!rArgs.IsQuickstart()) { sal_Bool bShowHelp = sal_False; |