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/inc | |
| 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/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index b1577b2afbe1..7b8359d44d15 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -136,11 +136,11 @@ class Desktop : public Application void SetSplashScreenText( const ::rtl::OUString& rText ); void SetSplashScreenProgress( sal_Int32 ); - private: // Bootstrap methods - static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > CreateApplicationServiceManager(); - // returns a non-null reference or throws an exception + static void InitApplicationServiceManager(); + // throws an exception upon failure + private: void RegisterServices(); void DeregisterServices(); |