[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/sal vcl/ios

[Tor Lillqvist (via logerrit)]

 include/sal/log-areas.dox     |    1 +
 vcl/ios/DataFlavorMapping.cxx |    2 ++
 vcl/ios/iOSTransferable.cxx   |   11 +++++++++++
 3 files changed, 14 insertions(+)

New commits:
commit d47b50588c852fdf08b523d59415b7b068ee4f7a
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed May 29 11:36:50 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 14:14:23 2019 +0200

    Add a couple of SAL_INFOs about types available on the system clipboard
    
    Change-Id: I821a699ee4f44881aadac89f265974a10095b544
    (cherry picked from commit 5337a84a64c8ef8401d6cf509f3e7fd99934e684)
    Reviewed-on: https://gerrit.libreoffice.org/79233
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e53f647c8260..eb21e7bec0a8 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -474,6 +474,7 @@ certain functionality.
 @li @c vcl.headless - bitmap-based backend
 @li @c vcl.helper
 @li @c vcl.icontest
+ at li @c vcl.ios.clipboard
 @li @c vcl.kde4 - KDE4
 @li @c vcl.kde5 - KDE5
 @li @c vcl.layout - Widget layout
diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index e90a8f9b245c..e3875a0bf9b0 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -556,6 +556,8 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const
         {
             flavors.realloc(flavors.getLength() + 1);
             flavors[flavors.getLength() - 1] = oOOFlavor;
+            SAL_INFO("vcl.ios.clipboard",
+                     "Mapped " << [sysFormat UTF8String] << " to " << oOOFlavor.MimeType);
         }
     }
 
diff --git a/vcl/ios/iOSTransferable.cxx b/vcl/ios/iOSTransferable.cxx
index b1bc4043ea9e..d3c7d0a5c02c 100644
--- a/vcl/ios/iOSTransferable.cxx
+++ b/vcl/ios/iOSTransferable.cxx
@@ -142,6 +142,17 @@ void iOSTransferable::initClipboardItemList()
         throw RuntimeException("Cannot get clipboard data", static_cast<XTransferable*>(this));
     }
 
+#ifdef SAL_LOG_INFO
+    NSString* types = @"";
+    for (unsigned i = 0; i < [pboardFormats count]; i++)
+    {
+        if ([types length] > 0)
+            types = [types stringByAppendingString:@", "];
+        types = [types stringByAppendingString:[pboardFormats objectAtIndex:i]];
+    }
+    SAL_INFO("vcl.ios.clipboard", "Types on clipboard: " << [types UTF8String]);
+#endif
+
     mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats);
 }