Reviewed by Chris.

        - fixed <rdar://problem/4067981> Mail places RTF flavor before RTFD flavor when dragging
        mixed image/text content.

        * WebView.subproj/WebHTMLView.m:
        (+[WebHTMLView _selectionPasteboardTypes]):
        put RTFD type before RTF type in array of types to declare

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3c7eb315ae4981fc704f08b3a21ef8901385761f..a24a96e421e0a32b6353981cf2dc2003865efb5f 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-10  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Chris.
+        
+        - fixed <rdar://problem/4067981> Mail places RTF flavor before RTFD flavor when dragging 
+        mixed image/text content.
+
+        * WebView.subproj/WebHTMLView.m:
+        (+[WebHTMLView _selectionPasteboardTypes]):
+        put RTFD type before RTF type in array of types to declare
+
 2005-05-09  Chris Blumenberg  <cblu@apple.com>
 
        Turned assertion into error message to prevent crash when encountering this bug:

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index f54da76ecdb974a1615030f92e08b3cb8a153c89..72c2597e890a2fd3ac66160f9a8a8d05d13d5bcf 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1050,7 +1050,7 @@ static WebHTMLView *lastHitView = nil;
 + (NSArray *)_selectionPasteboardTypes
 {
     // FIXME: We should put data for NSHTMLPboardType on the pasteboard but Microsoft Excel doesn't like our format of HTML (3640423).
-    return [NSArray arrayWithObjects:WebArchivePboardType, NSRTFPboardType, NSRTFDPboardType, NSStringPboardType, nil];
+    return [NSArray arrayWithObjects:WebArchivePboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, nil];
 }
 
 - (WebArchive *)_selectedArchive