diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2021-03-26 17:03:49 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2021-03-26 20:42:35 +0100 |
| commit | f96004096268f5e71120678e32fc8c74055819aa (patch) | |
| tree | a05f710c28240add305b4cc5ad90e493512a05ff /desktop | |
| parent | 2ebc8433fb9be3df5404783233a93be766737d80 (diff) | |
lok: mark strings static after pre-init, not after the fork.
Change-Id: I1fbd4a9ef1e07ec87ca194128ed35de1dc429993
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113127
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 031bd2625b22..0112f503cc65 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -6135,8 +6135,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char if (eStage == PRE_INIT) rtl_alloc_preInit(true); - else if (eStage == SECOND_INIT) - rtl_alloc_preInit(false); if (eStage != SECOND_INIT) comphelper::LibreOfficeKit::setActive(); @@ -6387,6 +6385,10 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char activateNotebookbar(u"Draw"); } + // staticize all strings. + if (eStage == PRE_INIT) + rtl_alloc_preInit(false); + return bInitialized; } |