diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2021-03-26 17:03:49 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2021-04-16 17:18:28 +0200 |
| commit | cb32c96b7cb39f497b0cda46ad6dd4fbf0f9b1be (patch) | |
| tree | 94137381d35d33c2b42d08ecbe77708b9dd7b9c3 | |
| parent | 03861e320192236045ed927a1dc2d3190dd40da7 (diff) | |
lok: mark strings static after pre-init, not after the fork.
Change-Id: I1fbd4a9ef1e07ec87ca194128ed35de1dc429993
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113164
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
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 7b8c9a47efab..3f55f9bfbf8e 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -6187,8 +6187,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(); @@ -6442,6 +6440,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; } |