diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-09 11:57:21 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-08-10 17:02:03 +0200 |
| commit | 006e90e29c6ca768e3a5d8d2a558a63b04817c4b (patch) | |
| tree | 52aeaaff4698a09ca3973def10d93dc7df7076b6 /desktop/source/app/app.cxx | |
| parent | 40c80e6a637e80c220f3e39b855cd975c3e94799 (diff) | |
Related fdo#53006: Do not instantiate service manager too early
... in soffice_main calling GetCommandLineArgs, before Desktop::Init takes care
of synchronization of the per-user bundled/shared extension information (as the
latter potentially modifies data that the service manager consumes upon
instantiation; this e.g. lead to bundled extensions not working during first
start after an upgrade).
The only reason GetCommandLineArgs needed ensureProcessServiceFactory appears to
be the ExternalUriReferenceTranslator. So defer its usage to when the relevant
cmd line args are actually processed (which, luckily, does not yet happen in
soffice_main's usage of GetCommandLineArgs).
Change-Id: I6ebbf0a4ad1c6f64c8fbbe2b0d7628fa42a1afb6
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'desktop/source/app/app.cxx')
| -rw-r--r-- | desktop/source/app/app.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 263ca3ffe636..991577f10dfa 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -278,7 +278,6 @@ namespace CommandLineArgs& Desktop::GetCommandLineArgs() { - ensureProcessServiceFactory(); return theCommandLineArgs::get(); } |