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

[Tor Lillqvist (via logerrit)]

 vcl/ios/DataFlavorMapping.cxx |   19 +++++--------------
 vcl/ios/DataFlavorMapping.hxx |    4 ----
 2 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 97b7fd1386dbec988ba649be7e266c32b6c00eba
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed May 29 13:50:14 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 14:15:14 2019 +0200

    The iOS DataFlavorMapper::getAllSupportedPboardTypes() is unused
    
    Change-Id: Icc72fca62e189559956abc0ebbca9ce196a02073
    (cherry picked from commit db5fc799d4c7091cf002bcab49d16cfadc147279)
    Reviewed-on: https://gerrit.libreoffice.org/79235
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index 469c8201bf93..644306d6b122 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -567,16 +567,4 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const
     return flavors;
 }
 
-NSArray* DataFlavorMapper::getAllSupportedPboardTypes()
-{
-    NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity:SIZE_FLAVOR_MAP];
-
-    for (sal_uInt32 i = 0; i < SIZE_FLAVOR_MAP; i++)
-    {
-        [array addObject:flavorMap[i].SystemFlavor];
-    }
-
-    return [array autorelease];
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/ios/DataFlavorMapping.hxx b/vcl/ios/DataFlavorMapping.hxx
index 9485e2561689..936d7fc2f48b 100644
--- a/vcl/ios/DataFlavorMapping.hxx
+++ b/vcl/ios/DataFlavorMapping.hxx
@@ -111,10 +111,6 @@ public:
     css::uno::Sequence<css::datatransfer::DataFlavor>
     typesArrayToFlavorSequence(NSArray* types) const;
 
-    /* Returns an NSArray containing all pasteboard types supported by OOo
-   */
-    static NSArray* getAllSupportedPboardTypes();
-
 private:
     /* Determines if the provided Mime content type is valid.
    */
commit aa59183c808b6af890d83d6d0f87fffaed3f5ace
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed May 29 13:35:54 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 14:14:50 2019 +0200

    tdf#124752: We do need to accept text/html from the system clipboard
    
    Sadly we can't accept public.utf8-plain-text, i.e.
    text/plain;charset=utf-8, as the code does not know of such a
    SotClipboardFormatId. The only text/plain is UTF-16.
    
    And it probably is a good idea to accept HTML anyway. We have to
    continue to (I think) not offer text/html because of the assertion
    failure issue, see comment in DataFlavorMapper::openOfficeToSystemFlavor().
    
    Change-Id: If5d77b97649424e347c50af10475c2be997c8632
    (cherry picked from commit 530d7618a2e8c36c5212135a3dbe9aef99625d93)
    Reviewed-on: https://gerrit.libreoffice.org/79234
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index e3875a0bf9b0..469c8201bf93 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -74,6 +74,8 @@ NSString* OUStringToNSString(const OUString& ustring)
 }
 
 NSString* PBTYPE_PLAINTEXT = (__bridge NSString*)kUTTypePlainText;
+// Nope. See commented-out use below.
+// NSString* PBTYPE_UTF8PLAINTEXT = (__bridge NSString*)kUTTypeUTF8PlainText;
 NSString* PBTYPE_RTF = (__bridge NSString*)kUTTypeRTF;
 NSString* PBTYPE_PNG = (__bridge NSString*)kUTTypePNG;
 NSString* PBTYPE_JPEG = (__bridge NSString*)kUTTypeJPEG;
@@ -122,11 +124,12 @@ struct FlavorMap
 
 static const FlavorMap flavorMap[]
     = { { PBTYPE_PLAINTEXT, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", true },
+        // Nope. The LO code does not understand text/plain in UTF-8. Which is a shame.
+        // PBTYPE_UTF8PLAINTEXT, "text/plain;charset=utf-8", "Unicode Text (UTF-8)", false },
         { PBTYPE_RTF, "text/rtf", "Rich Text Format", false },
         { PBTYPE_PNG, "image/png", "Portable Network Graphics", false },
         { PBTYPE_JPEG, "image/jpeg", "Portable Network Graphics", false },
-        // Nope, sorry. See comment in openOfficeToSystemFlavor() below.
-        // { PBTYPE_HTML, "text/html", "Plain HTML", false },
+        { PBTYPE_HTML, "text/html", "Plain HTML", false },
         { PBTYPE_PDF, "application/pdf", "PDF File", false },
         { PBTYPE_SESX, FLAVOR_SESX, "Star Embed Source (XML)", false },
         { PBTYPE_SLSDX, FLAVOR_SLSDX, "Star Link Source Descriptor (XML)", false },