diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-24 17:41:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-24 17:45:10 +0200 |
| commit | 2f14e2e67c58fe6948501d57a38cd0d2ad84dfff (patch) | |
| tree | 60108802825e89d74a7479a0678e2521d6d99827 /desktop/source/app/appinit.cxx | |
| parent | 7528e11e372e43556cb7169f98aad39ac1e07332 (diff) | |
fdo#54385: Displaying help/version early on UNX requires service manager
This regression was introduced with 6c6358a6822d3562b9b8c7668a7d60d6c644dfe8
"Related fdo#53006: Do not instantiate service manager too early."
Change-Id: If22ea3ac6474188bf0792246620e5c705a813445
Diffstat (limited to 'desktop/source/app/appinit.cxx')
| -rw-r--r-- | desktop/source/app/appinit.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 64a882959468..367b77ab08fd 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -111,20 +111,21 @@ static void configureUcb() #endif // GNOME_VFS_ENABLED } -Reference< XMultiServiceFactory > Desktop::CreateApplicationServiceManager() +void Desktop::InitApplicationServiceManager() { RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createApplicationServiceManager" ); - + Reference<XMultiServiceFactory> sm; #ifdef ANDROID rtl::OUString aUnoRc( OUString( "file:///assets/program/unorc" ) ); - return Reference<XMultiServiceFactory>( + sm.set( cppu::defaultBootstrap_InitialComponentContext( aUnoRc )->getServiceManager(), UNO_QUERY_THROW); #else - return Reference<XMultiServiceFactory>( + sm.set( cppu::defaultBootstrap_InitialComponentContext()->getServiceManager(), UNO_QUERY_THROW); #endif + comphelper::setProcessServiceFactory(sm); } void Desktop::DestroyApplicationServiceManager( Reference< XMultiServiceFactory >& xSMgr ) |