[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 fbd4b0104088d7d3c41bbf675e10ad884b5dc7cb
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 19 23:00:17 2002 +0000

    	Fixed: 3068112 - extra line breaks when copying from source window
    
            * Misc.subproj/WebSearchableTextView.m:
            (-[WebSearchableTextView copy:]): Convert CRLF to LF
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2765 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 87afb75..eab595c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3068112 - extra line breaks when copying from source window
+
+        * Misc.subproj/WebSearchableTextView.m:
+        (-[WebSearchableTextView copy:]): Convert CRLF to LF
+
 2002-11-19  David Hyatt  <hyatt at apple.com>
 
 	Make sure that if the scrollers are shown/hidden that we
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 87afb75..eab595c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3068112 - extra line breaks when copying from source window
+
+        * Misc.subproj/WebSearchableTextView.m:
+        (-[WebSearchableTextView copy:]): Convert CRLF to LF
+
 2002-11-19  David Hyatt  <hyatt at apple.com>
 
 	Make sure that if the scrollers are shown/hidden that we
diff --git a/WebKit/Misc.subproj/WebSearchableTextView.m b/WebKit/Misc.subproj/WebSearchableTextView.m
index 1c277f0..cc4e35b 100644
--- a/WebKit/Misc.subproj/WebSearchableTextView.m
+++ b/WebKit/Misc.subproj/WebSearchableTextView.m
@@ -42,6 +42,21 @@
     return lastFindWasSuccessful;
 }
 
+- (void)copy:(id)sender
+{
+    if ([self isRichText]) {
+        [super copy:sender];
+    }else{
+        //Convert CRLF to LF to workaround: 3105538 - Carbon doesn't convert text with CRLF to LF
+        NSMutableString *string = [[self string] mutableCopy];
+        [string replaceOccurrencesOfString:@"\r\n" withString:@"\n" options:0 range:NSMakeRange(0, [string length])];
+
+        NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
+        [pasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];
+        [pasteboard setString:string forType:NSStringPboardType];
+    }
+}
+
 @end
 
 @implementation NSString (_Web_StringTextFinding)

-- 
WebKit Debian packaging