[Libreoffice-commits] core.git: desktop/source

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f96004096268f5e71120678e32fc8c74055819aa
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Mar 26 17:03:49 2021 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Mar 26 20:42:35 2021 +0100

    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 at collabora.com>

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;
 }