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-10 22:26:47 +0100 |
| commit | ed27e44048f3e17a76e77b8567c4827ba1571046 (patch) | |
| tree | e29a7ddb1d10aa848e322d16baf05629b2b6fd61 | |
| parent | e5a17f9690cc775a84a4a7239179a1ad9c9cdf54 (diff) | |
lok: mark strings static after pre-init, not after the fork.
Change-Id: I1fbd4a9ef1e07ec87ca194128ed35de1dc429993
| -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 5ac2212f211b..1e76ea689951 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -6173,8 +6173,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(); @@ -6428,6 +6426,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; } |