diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2021-03-26 17:03:49 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-05-01 21:01:44 +0200 |
commit | 6d03ab40de87ae533caf01a670929d5de7e025cd (patch) | |
tree | 18d5a95a0bf0b32e14af991e6173162ba25d25f0 | |
parent | 93a77060fb653d38ae9cb3efc1916de6cab7ec46 (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>
-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 fcc260ee66a0..0c0ca3f9b362 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -6200,8 +6200,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(); @@ -6455,6 +6453,10 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char activateNotebookbar("Draw"); } + // staticize all strings. + if (eStage == PRE_INIT) + rtl_alloc_preInit(false); + return bInitialized; } |