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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 0ad6338bdd46186e8815bda894f935390c20c0aa
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 17 05:43:40 2002 +0000

    	- fixed 3061103 -- Line-breaks lost when submitting after pasting text from
    	MSIE into Alexander textarea
    
            * kwq/KWQLineEdit.mm: (QLineEdit::text):
            * kwq/KWQTextEdit.mm: (QTextEdit::text):
    	Turn \r\n sequences and standalone \r characters into \n characters on the way
    	out of AppKit land and into KHTML land. I didn't try to make this efficient
    	for the common case because these are not time-critical functions.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2350 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 21ec07f..038c557 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-10-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3061103 -- Line-breaks lost when submitting after pasting text from
+	MSIE into Alexander textarea
+
+        * kwq/KWQLineEdit.mm: (QLineEdit::text):
+        * kwq/KWQTextEdit.mm: (QTextEdit::text):
+	Turn \r\n sequences and standalone \r characters into \n characters on the way
+	out of AppKit land and into KHTML land. I didn't try to make this efficient
+	for the common case because these are not time-critical functions.
+
 2002-10-16  Richard Williamson  <rjw at apple.com>
 
         Fixed a few regressions in drawing of frame resize handle
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 21ec07f..038c557 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-10-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3061103 -- Line-breaks lost when submitting after pasting text from
+	MSIE into Alexander textarea
+
+        * kwq/KWQLineEdit.mm: (QLineEdit::text):
+        * kwq/KWQTextEdit.mm: (QTextEdit::text):
+	Turn \r\n sequences and standalone \r characters into \n characters on the way
+	out of AppKit land and into KHTML land. I didn't try to make this efficient
+	for the common case because these are not time-critical functions.
+
 2002-10-16  Richard Williamson  <rjw at apple.com>
 
         Fixed a few regressions in drawing of frame resize handle
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 21ec07f..038c557 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-10-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3061103 -- Line-breaks lost when submitting after pasting text from
+	MSIE into Alexander textarea
+
+        * kwq/KWQLineEdit.mm: (QLineEdit::text):
+        * kwq/KWQTextEdit.mm: (QTextEdit::text):
+	Turn \r\n sequences and standalone \r characters into \n characters on the way
+	out of AppKit land and into KHTML land. I didn't try to make this efficient
+	for the common case because these are not time-critical functions.
+
 2002-10-16  Richard Williamson  <rjw at apple.com>
 
         Fixed a few regressions in drawing of frame resize handle
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index bd351dc..e0ca802 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -74,7 +74,10 @@ void QLineEdit::setText(const QString &s)
 QString QLineEdit::text()
 {
     KWQNSTextField *textField = (KWQNSTextField *)getView();
-    return QString::fromNSString([textField stringValue]);
+    NSMutableString *text = [[[textField stringValue] mutableCopy] autorelease];
+    [text replaceOccurrencesOfString:@"\r\n" withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [text length])];
+    [text replaceOccurrencesOfString:@"\r" withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [text length])];
+    return QString::fromNSString(text);
 }
 
 void QLineEdit::setMaxLength(int len)
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index ad0fb9b..89e440c 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -44,7 +44,10 @@ void QTextEdit::setText(const QString &string)
 QString QTextEdit::text()
 {
     KWQTextArea *textView = (KWQTextArea *)getView();
-    return QString::fromNSString([textView text]);
+    NSMutableString *text = [[[textView text] mutableCopy] autorelease];
+    [text replaceOccurrencesOfString:@"\r\n" withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [text length])];
+    [text replaceOccurrencesOfString:@"\r" withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [text length])];
+    return QString::fromNSString(text);
 }
 
 int QTextEdit::paragraphs() const
@@ -62,7 +65,10 @@ int QTextEdit::paragraphLength(int paragraph) const
 QString QTextEdit::text(int paragraph)
 {
     KWQTextArea *textView = (KWQTextArea *)getView();
-    return QString::fromNSString([textView textForParagraph:paragraph]);
+    NSMutableString *text = [[[textView textForParagraph:paragraph] mutableCopy] autorelease];
+    [text replaceOccurrencesOfString:@"\r\n" withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [text length])];
+    [text replaceOccurrencesOfString:@"\r" withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [text length])];
+    return QString::fromNSString(text);
 }
 
 int QTextEdit::lineOfChar(int paragraph, int index)

-- 
WebKit Debian packaging