[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 39606fb1a58efcb3fb6ce0eb04d096f560f4f7b1
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 27 06:26:49 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3457831 -- REGRESSION: copying particular text and pasting (plain) produces lots of extra text
    
            * khtml/khtml_part.cpp: (KHTMLPart::text): Check for the end node when following a
            link to the parent node, not just when following a link to the next child node.
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::attributedString): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bacc0f2..0430ec6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1 +1,11 @@
+2003-10-26  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3457831 -- REGRESSION: copying particular text and pasting (plain) produces lots of extra text
+
+        * khtml/khtml_part.cpp: (KHTMLPart::text): Check for the end node when following a
+        link to the parent node, not just when following a link to the next child node.
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::attributedString): Ditto.
+
 == Rolled over to ChangeLog-2003-10-25 ==
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index c37b61c..9d69cf5 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2366,6 +2366,7 @@ QString KHTMLPart::text(const DOM::Range &r) const
       if(next.isNull()) next = n.nextSibling();
       while( next.isNull() && !n.parentNode().isNull() ) {
         n = n.parentNode();
+        if(n == endNode) break;
         next = n.nextSibling();
         unsigned short id = n.elementId();
         switch(id) {
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 75fbc57..84b4b2e 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2406,6 +2406,8 @@ NSAttributedString *KWQKHTMLPart::attributedString(NodeImpl *_start, int startOf
         while (next.isNull() && !n.parentNode().isNull()) {
             QString text;
             n = n.parentNode();
+            if (n == endNode)
+                break;
             next = n.nextSibling();
 
             unsigned short _id = n.elementId();

-- 
WebKit Debian packaging