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/sofficemain.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/sofficemain.cxx')
| -rwxr-xr-x | desktop/source/app/sofficemain.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index e867601df0ee..9463b51c9fb1 100755 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -62,11 +62,13 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() const desktop::CommandLineArgs& rCmdLineArgs = aDesktop.GetCommandLineArgs(); if ( rCmdLineArgs.IsHelp() ) { + desktop::Desktop::InitApplicationServiceManager(); desktop::displayCmdlineHelp(); return EXIT_SUCCESS; } else if ( rCmdLineArgs.IsVersion() ) { + desktop::Desktop::InitApplicationServiceManager(); desktop::displayVersion(); return EXIT_SUCCESS; } |