From 3f8ac50022215e53b592c1d630dd0609cab4e58e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 29 May 2019 13:35:54 +0300 Subject: 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 --- vcl/ios/DataFlavorMapping.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx index be4ecb299ff5..a330209a2d36 100644 --- a/vcl/ios/DataFlavorMapping.cxx +++ b/vcl/ios/DataFlavorMapping.cxx @@ -75,6 +75,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; @@ -123,11 +125,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 }, -- cgit v1.2.3