[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/osx
Xisco Fauli
anistenis at gmail.com
Sat Oct 28 02:13:03 UTC 2017
vcl/osx/DataFlavorMapping.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 671182b8f59e8e390b79b7f3b35535b8c3ec1408
Author: Xisco Fauli <anistenis at gmail.com>
Date: Wed Oct 18 17:30:57 2017 +0200
tdf#109343 Fix paste as .RTF on Mac
Change-Id: Ida0433437301ea2803373e534df3d42f67d6aff8
Reviewed-on: https://gerrit.libreoffice.org/43513
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>
(cherry picked from commit dd0bc7323014c528fefb516cacae0591f270862a)
Reviewed-on: https://gerrit.libreoffice.org/43857
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 6db7d4105985..012889abfb60 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -111,7 +111,7 @@ namespace
static const FlavorMap flavorMap[] =
{
{ NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", true },
- { NSRTFPboardType, "text/richtext", "Rich Text Format", false },
+ { NSRTFPboardType, "text/rtf", "Rich Text Format", false },
{ NSTIFFPboardType, "image/png", "Portable Network Graphics", false },
{ NSHTMLPboardType, "text/html", "Plain Html", false },
{ NSFilenamesPboardType, "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", false },
More information about the Libreoffice-commits
mailing list