changeset 12949:eafaa1778c63

8086038: [macosx] No available data flavors when copying from Microsoft Word for Mac Reviewed-by: serb, alexsch
author mcherkas
date Tue, 06 Oct 2015 10:24:12 +0300
parents 9b0e9d8ccccf
children 95263779ee37
files src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties	Mon Oct 05 15:36:43 2015 +0300
+++ b/src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties	Tue Oct 06 10:24:12 2015 +0300
@@ -74,3 +74,4 @@
 HTML=text/html;charset=utf-8;eoln="\r\n";terminators=1
 URL=application/x-java-url;class=java.net.URL,\
     text/uri-list;eoln="\r\n";terminators=1
+XPICT=image/x-pict;class=java.io.InputStream
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java	Mon Oct 05 15:36:43 2015 +0300
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java	Tue Oct 06 10:24:12 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/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m	Mon Oct 05 15:36:43 2015 +0300
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m	Tue Oct 06 10:24:12 2015 +0300
@@ -56,6 +56,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;
 }