From a13624b0dd0e71ee70291433b97ff1aadfd5b41d Mon Sep 17 00:00:00 2001
From: mcherkas <unknown>
Date: Tue, 6 Oct 2015 12:54:22 +0300
Subject: [PATCH] 8086038: [macosx] No available data flavors when copying from
 Microsoft Word for Mac Reviewed-by: serb, alexsch

---
 src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java | 4 +++-
 src/macosx/lib/flavormap.properties                      | 1 +
 src/macosx/native/sun/awt/CDataTransferer.m              | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
index f82d5930a..cbe50b834 100644
--- a/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
+++ b/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
@@ -54,7 +54,8 @@ public class CDataTransferer extends DataTransferer {
         "PDF",
         "URL",
         "PNG",
-        "JFIF"
+        "JFIF",
+        "XPICT"
     };
 
     static {
@@ -78,6 +79,7 @@ public class CDataTransferer extends DataTransferer {
     public static final int CF_URL         = 7;
     public static final int CF_PNG         = 8;
     public static final int CF_JPEG        = 9;
+    public static final int CF_XPICT       = 10;
 
     private CDataTransferer() {}
 
diff --git a/src/macosx/lib/flavormap.properties b/src/macosx/lib/flavormap.properties
index 8f17d95fa..ae4e17c32 100644
--- a/src/macosx/lib/flavormap.properties
+++ b/src/macosx/lib/flavormap.properties
@@ -81,3 +81,4 @@ RICH_TEXT=text/rtf
 HTML=text/html;charset=utf-8;eoln="\r\n";terminators=1
 URL=application/x-java-url;class=java.net.URL
 URL=text/uri-list;eoln="\r\n";terminators=1
+XPICT=image/x-pict;class=java.io.InputStream
diff --git a/src/macosx/native/sun/awt/CDataTransferer.m b/src/macosx/native/sun/awt/CDataTransferer.m
index 488068a4f..4c1e1a40f 100644
--- a/src/macosx/native/sun/awt/CDataTransferer.m
+++ b/src/macosx/native/sun/awt/CDataTransferer.m
@@ -58,6 +58,8 @@ NSMutableDictionary *getMappingTable() {
                               forKey:[NSNumber numberWithLong:sun_lwawt_macosx_CDataTransferer_CF_PNG]];
         [sStandardMappings setObject:(NSString*)kUTTypeJPEG
                               forKey:[NSNumber numberWithLong:sun_lwawt_macosx_CDataTransferer_CF_JPEG]];
+        [sStandardMappings setObject:NSPICTPboardType
+                              forKey:[NSNumber numberWithLong:sun_lwawt_macosx_CDataTransferer_CF_XPICT]];
     }
     return sStandardMappings;
 }
-- 
GitLab