core.git: Branch 'distro/collabora/co-24.04' - desktop/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 4f404f2b18692276d157c4de9bfbb1f6370ad58d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jan 23 19:37:54 2024 +0000
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jan 23 21:22:07 2024 +0100

    preload sal_textenc
    
    use RTL_TEXTENCODING_MS_1250 to trigger Impl_getTextEncodingData to
    dlopen sal_textenclo early
    
    Change-Id: Ie96b81615cbd4b479d731916518835b2f72adf6a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162477
    Reviewed-by: Neil Guertin <neil.guer...@collabora.com>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index faa6d44cd447..80442dc5ffa2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7435,6 +7435,12 @@ static void preloadData()
     if(bAbort)
         std::cerr << "CheckExtensionDependencies failed" << std::endl;
 
+    std::cerr << "Preload textencodings"; // sal_textenc
+    // Use RTL_TEXTENCODING_MS_1250 to trigger Impl_getTextEncodingData
+    // to dlopen sal_textenclo
+    (void)OUStringToOString(u"arbitrary string", RTL_TEXTENCODING_MS_1250);
+    std::cerr << "
";
+
     // setup LanguageTool config before spell checking init
     setLanguageToolConfig();