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

[Caolán McNamara (via logerrit)]

Rebased ref, commits from common ancestor:
commit d2895906f20e756205a9c540bf91306f030aaa35
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:55:30 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();
 
commit 86de5c5e7d54fda08ae5c8fb5f13dc57ec3ab9a8
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jan 23 17:41:11 2024 +0000
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jan 23 21:55:19 2024 +0100

    complete filename isn't meaningful in this mode
    
    Change-Id: Icc5bdac688ca6b328dcf097c9638b4e6df211332

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e372228721e3..8412c0355ed0 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -65,7 +65,7 @@
 #include <queryiter.hxx>
 #include <tokenarray.hxx>
 #include <compare.hxx>
-
+#include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>
 #include <comphelper/string.hxx>
@@ -2357,16 +2357,20 @@ void ScInterpreter::ScCell()
                             eConv == FormulaGrammar::CONV_XL_OOX)
                         {
                             // file name and table name: 
FILEPATH/[FILENAME]TABLE
-                            aFuncResult = rURLObj.GetPartBeforeLastName()
-                                + "[" + 
rURLObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous)
-                                + "]" + aTabName;
+                            if (!comphelper::LibreOfficeKit::isActive())
+                                aFuncResult = rURLObj.GetPartBeforeLastName();
+                            aFuncResult += "[" + 
rURLObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous) +
+                                           "]" + aTabName;
                         }
                         else
                         {
                             // file name and table name: 
'FILEPATH/FILENAME'#$TABLE
-                            aFuncResult = "'"
-                                + 
rURLObj.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)
-                                + "'#$" + aTabName;
+                            aFuncResult = "'";
+                            if (!comphelper::LibreOfficeKit::isActive())
+                                aFuncResult += 
rURLObj.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous);
+                            else
+                                aFuncResult += 
rURLObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous);
+                            aFuncResult += "'#$" + aTabName;
                         }
                     }
                 }