[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit d5222dde15a335f6ee069e5fcc05b37d6b65450a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 8 21:50:52 2004 +0000

    	Fixed: <rdar://problem/3640423>: (REGRESSION: can't paste text copied from web page into Excel (due to HTML on the pasteboard?))
    
            Reviewed by darin.
    
            * WebView.subproj/WebHTMLView.m:
            (+[WebHTMLView _selectionPasteboardTypes]): don't include NSHTMLPboardType
            (-[WebHTMLView _selectedArchive]): removed markup string parameter
            (_selectionPasteboardTypes::if): don't put NSHTMLPboardType on the pasteboard
            * WebView.subproj/WebHTMLViewPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 971ccb2..c9bd3d4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-08  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3640423>: (REGRESSION: can't paste text copied from web page into Excel (due to HTML on the pasteboard?))
+
+        Reviewed by darin.
+
+        * WebView.subproj/WebHTMLView.m:
+        (+[WebHTMLView _selectionPasteboardTypes]): don't include NSHTMLPboardType
+        (-[WebHTMLView _selectedArchive]): removed markup string parameter
+        (_selectionPasteboardTypes::if): don't put NSHTMLPboardType on the pasteboard
+        * WebView.subproj/WebHTMLViewPrivate.h:
+
 2004-06-07  Darin Adler  <darin at apple.com>
 
         Reviewed by Chris.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 825f4b6..aeeb334 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -56,8 +56,7 @@
 		};
 		034768E0FF38A50411DB9C8B = {
 			explicitFileType = wrapper.framework;
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			path = WebKit.framework;
 			refType = 3;
 			sourceTree = BUILT_PRODUCTS_DIR;
@@ -3278,8 +3277,7 @@
 			};
 		};
 		BE1B2F5504755C7700CA289C = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			path = Foundation.framework;
 			refType = 3;
@@ -4422,8 +4420,7 @@
 			};
 		};
 		F5C2869302846DCD018635CA = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = ApplicationServices.framework;
 			path = /System/Library/Frameworks/ApplicationServices.framework;
@@ -4431,8 +4428,7 @@
 			sourceTree = "<absolute>";
 		};
 		F5C2869402846DCD018635CA = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = Carbon.framework;
 			path = /System/Library/Frameworks/Carbon.framework;
@@ -4440,8 +4436,7 @@
 			sourceTree = "<absolute>";
 		};
 		F5C2869502846DCD018635CA = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = Cocoa.framework;
 			path = /System/Library/Frameworks/Cocoa.framework;
@@ -4812,8 +4807,7 @@
 //F73
 //F74
 		F738C9E903FAD3DF0321FBE0 = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = file;
 			name = JavaScriptCore.framework;
 			path = build/JavaScriptCore.framework;
@@ -4821,8 +4815,7 @@
 			sourceTree = "<group>";
 		};
 		F738C9EA03FAD3DF0321FBE0 = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = file;
 			name = WebCore.framework;
 			path = build/WebCore.framework;
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index a2558e4..676f66b 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -658,14 +658,15 @@ static WebHTMLView *lastHitView = nil;
 
 + (NSArray *)_selectionPasteboardTypes
 {
-    return [NSArray arrayWithObjects:WebArchivePboardType, NSHTMLPboardType, NSRTFPboardType, NSRTFDPboardType, NSStringPboardType, nil];
+    // 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];
 }
 
-- (WebArchive *)_selectedArchive:(NSString **)markupString
+- (WebArchive *)_selectedArchive
 {
     NSArray *nodes;
-    *markupString = [[self _bridge] markupStringFromRange:[[self _bridge] selectedDOMRange] nodes:&nodes];
-    return [[self _dataSource] _archiveWithMarkupString:*markupString nodes:nodes];
+    NSString *markupString = [[self _bridge] markupStringFromRange:[[self _bridge] selectedDOMRange] nodes:&nodes];
+    return [[self _dataSource] _archiveWithMarkupString:markupString nodes:nodes];
 }
 
 - (NSData *)_selectedRTFData
@@ -1112,16 +1113,8 @@ static WebHTMLView *lastHitView = nil;
 - (void)writeSelectionWithPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard
 {
     // Put HTML on the pasteboard.
-    NSString *markupString = nil;
-    WebArchive *archive = nil;
-    if ([types containsObject:NSHTMLPboardType]) {
-        archive = [self _selectedArchive:&markupString];
-        [pasteboard setString:markupString forType:NSHTMLPboardType];
-    }
     if ([types containsObject:WebArchivePboardType]) {
-        if (!archive) {
-            archive = [self _selectedArchive:&markupString];
-        }
+        WebArchive *archive = [self _selectedArchive];
         [pasteboard setData:[archive data] forType:WebArchivePboardType];
     }
     
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index ae59e51..d00a486 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -36,7 +36,7 @@
 + (NSArray *)_insertablePasteboardTypes;
 + (NSArray *)_selectionPasteboardTypes;
 - (void)_writeSelectionToPasteboard:(NSPasteboard *)pasteboard;
-- (WebArchive *)_selectedArchive:(NSString **)markupString;
+- (WebArchive *)_selectedArchive;
 - (NSData *)_selectedRTFData;
 - (BOOL)_canDelete;
 - (BOOL)_canPaste;

-- 
WebKit Debian packaging