postprocess/Rdb_services.mk | 2 +- solenv/bin/native-code.py | 2 +- vcl/source/treelist/transfer2.cxx | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit 19a34e3f2985fb66f99f9e308f37b5f8f11e47f4 Author: Tor Lillqvist <t...@iki.fi> AuthorDate: Thu Apr 14 14:25:31 2022 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Tue Apr 19 11:07:36 2022 +0200 Avoid LOKClipboard harder on iOS When I back- or side-ported cde6577dcb9c94aca7605790d34c83a5ff62edad to this branch (as 0111b70afdce44118a3616496c70c75962e7f57f) I could not apply all of it because this branch was so different, or something, then. But now more of it is needed, and does apply. 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> diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 98abf2de3f7b..47c340b020a7 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -340,7 +340,7 @@ endif # lokclipboard.component ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),) -$(if $(filter-out $(OS),IOS), \ +$(if $(filter-out $(OS),iOS), \ $(eval $(call gb_Rdb_add_components,services,\ desktop/lokclipboard))) else diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 5e1b4db93ec9..0e2ed402c750 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -129,7 +129,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(