[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source

[Michael Meeks (via logerrit)]

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

New commits:
commit cb32c96b7cb39f497b0cda46ad6dd4fbf0f9b1be
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 Apr 16 17:18:28 2021 +0200

    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 at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

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