core.git: 2 commits - basctl/source desktop/source

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/baside2b.cxx |    9 ++++++---
 desktop/source/lib/init.cxx         |    6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 3b6f04ea7033c5ca529363a4027cf2cb7d2c7ee3
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 25 08:46:52 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jan 25 12:09:28 2024 +0100

    Resolves: tdf#159368 crash on tools, macros, edit
    
    when launched from startcenter
    
    Change-Id: I362bfe27914445c3027b6e8a125a75cc31679678
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162557
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 52b2194a93d9..9ee9c70c23ac 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1303,9 +1303,12 @@ void EditorWindow::ChangeFontColor( Color aColor )
 
 void EditorWindow::UpdateSyntaxHighlighting ()
 {
-    const sal_uInt32 nCount = pEditEngine->GetParagraphCount();
-    for (sal_uInt32 i = 0; i < nCount; ++i)
-        DoDelayedSyntaxHighlight(i);
+    if (pEditEngine)
+    {
+        const sal_uInt32 nCount = pEditEngine->GetParagraphCount();
+        for (sal_uInt32 i = 0; i < nCount; ++i)
+            DoDelayedSyntaxHighlight(i);
+    }
 }
 
 void EditorWindow::ImplSetFont()
commit 611feba951c9d6904540472f91f34395de341dc6
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jan 23 19:37:54 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jan 25 12:09:16 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>
    (cherry picked from commit 4f404f2b18692276d157c4de9bfbb1f6370ad58d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162541
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ebef6305c2ad..cbaa66024596 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7430,6 +7430,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();