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

[Caolán McNamara (via logerrit)]

 basic/source/runtime/methods.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit a6599458af8e3f2e4758aaef92bfd34b41b36ead
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 30 12:11:10 2025 +0000
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Feb 4 08:21:00 2025 +0100

    disable SbRtl_Shell by default in kit-mode
    
    Change-Id: I645c776bf59a718f4946c2c70edd9194f039e471
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180942
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ad3b638805a2..0ba8658730af 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -44,6 +44,7 @@
 #include <rtl/string.hxx>
 #include <sal/log.hxx>
 #include <comphelper/DirectoryHelper.hxx>
+#include <comphelper/lok.hxx>
 
 #include <runtime.hxx>
 #include <sbunoobj.hxx>
@@ -3461,6 +3462,13 @@ void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool)
     }
     else
     {
+        // Just go straight to error in this case
+        if (comphelper::LibreOfficeKit::isActive())
+        {
+            StarBASIC::Error(ERRCODE_BASIC_FILE_NOT_FOUND);
+            return;
+        }
+
         oslProcessOption nOptions = osl_Process_SEARCHPATH | 
osl_Process_DETACHED;
 
         OUString aCmdLine = rPar.Get(1)->GetOUString();