[Libreoffice-commits] core.git: solenv/bin vcl/source

[Tor Lillqvist (via logerrit)]

 solenv/bin/native-code.py         |    2 +-
 vcl/source/treelist/transfer2.cxx |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 33ec31c24053a96f167d11c734d72ec960246e04
Author:     Tor Lillqvist <t...@iki.fi>
AuthorDate: Thu Apr 14 14:25:31 2022 +0300
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 12 18:35:44 2023 +0000

    Avoid LOKClipboard harder on iOS
    
    Change-Id: I2710a7537594c486878a68c630f762a24ac81c49
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133017
    Tested-by: Tor Lillqvist <t...@collabora.com>
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146739
    (cherry picked from commit 069aae6be68d67b45222740de01467d11f15adfb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146800
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 660c5d65fd57..4928b146df93 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -128,7 +128,7 @@ core_constructor_list = [
     "com_sun_star_comp_dba_ODatabaseSource",
     "com_sun_star_comp_dba_ORowSet_get_implementation",
 # desktop/lokclipboard.component
-    "desktop_LOKClipboard_get_implementation",
+    ("desktop_LOKClipboard_get_implementation", "#ifndef IOS"),
 # drawinglayer/drawinglayer.component
     "drawinglayer_XPrimitive2DRenderer",
 # embeddedobj/util/embobj.component
diff --git a/vcl/source/treelist/transfer2.cxx 
b/vcl/source/treelist/transfer2.cxx
index d0a105554c0f..05183b9c0485 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -484,11 +484,16 @@ Reference<XClipboard> GetSystemClipboard()
     Reference<XClipboard> xClipboard;
     try
     {
+#ifdef IOS
+        if (false)
+            ;
+#else
         if (comphelper::LibreOfficeKit::isActive())
         {
             xClipboard = css::datatransfer::clipboard::LokClipboard::create(
                     comphelper::getProcessComponentContext());
         }
+#endif
         else
         {
             xClipboard = css::datatransfer::clipboard::SystemClipboard::create(