[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 9b52c850b0b259d7d279259723640218a56c4018
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 17 19:47:35 2004 +0000

            Reviewed by NOBODY (OOPS!).
    
            - fixed rdar://problem/3312803>: extra space in copied text (3g.co.uk)
    
            * khtml/khtml_part.cpp: (KHTMLPart::text): Explicitly set neededSpace to false after
            processing a line break. Doesn't really have an effect here, but matches the change
            to the styled text version.
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::attributedString): Same change in the styled
            text version.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6233 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 28d0f4a..82197cf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-03-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        - fixed rdar://problem/3312803>: extra space in copied text (3g.co.uk)
+
+        * khtml/khtml_part.cpp: (KHTMLPart::text): Explicitly set neededSpace to false after
+        processing a line break. Doesn't really have an effect here, but matches the change
+        to the styled text version.
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::attributedString): Same change in the styled
+        text version.
+
 2004-03-16  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 5515c34..1f78965 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2306,6 +2306,7 @@ QString KHTMLPart::text(const DOM::Range &r) const
       if(n.nodeType() == DOM::Node::TEXT_NODE) {
           if (hasNewLine) {
               addedSpace = true;
+              needSpace = false;
               hasNewLine = false;
           }
           QString str = n.nodeValue().string();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 522c9d7..d53bfea 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2280,6 +2280,9 @@ NSAttributedString *KWQKHTMLPart::attributedString(NodeImpl *_start, int startOf
             if (n.nodeType() == Node::TEXT_NODE) {
                 if (hasNewLine) {
                     addedSpace = true;
+                    needSpace = false;
+                    [pendingStyledSpace release];
+                    pendingStyledSpace = nil;
                     hasNewLine = false;
                 }
                 QString text;

-- 
WebKit Debian packaging