changeset 11040:d3b0a91b15b3

8086038: [macosx] No available data flavors when copying from Microsoft Word for Mac Reviewed-by: serb, alexsch
author mcherkas
date Tue, 06 Oct 2015 12:54:22 +0300
parents e484c0558318
children 202de41724fa
files src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java src/macosx/lib/flavormap.properties src/macosx/native/sun/awt/CDataTransferer.m
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java	Thu Oct 01 15:16:35 2015 +0900
+++ b/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java	Tue Oct 06 12:54:22 2015 +0300
@@ -54,7 +54,8 @@
         "PDF",
         "URL",
         "PNG",
-        "JFIF"
+        "JFIF",
+        "XPICT"
     };
 
     static {
@@ -78,6 +79,7 @@
     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() {}
 
--- a/src/macosx/lib/flavormap.properties	Thu Oct 01 15:16:35 2015 +0900
+++ b/src/macosx/lib/flavormap.properties	Tue Oct 06 12:54:22 2015 +0300
@@ -81,3 +81,4 @@
 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
--- a/src/macosx/native/sun/awt/CDataTransferer.m	Thu Oct 01 15:16:35 2015 +0900
+++ b/src/macosx/native/sun/awt/CDataTransferer.m	Tue Oct 06 12:54:22 2015 +0300
@@ -58,6 +58,8 @@
                               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;
 }