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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 7a60f3b1412949fc09693be01a4925c603e3a26f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 13 18:01:59 2004 +0000

            Reviewed by me
    
            * khtml/editing/htmlediting_impl.cpp:
            (khtml::ApplyStyleCommandImpl::applyStyleIfNeeded): Fix deployment
            build bustage. Uninitialized variable.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6587 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7f417e7..3e6833f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2004-05-13  Ken Kocienda  <kocienda at apple.com>
 
+        Reviewed by me
+
+        * khtml/editing/htmlediting_impl.cpp:
+        (khtml::ApplyStyleCommandImpl::applyStyleIfNeeded): Fix deployment
+        build bustage. Uninitialized variable.
+
+2004-05-13  Ken Kocienda  <kocienda at apple.com>
+
         Reviewed by Hyatt
 
         Implemented first cut at text style change code.
diff --git a/WebCore/khtml/editing/htmlediting_impl.cpp b/WebCore/khtml/editing/htmlediting_impl.cpp
index 52d0a28..47a4a22 100644
--- a/WebCore/khtml/editing/htmlediting_impl.cpp
+++ b/WebCore/khtml/editing/htmlediting_impl.cpp
@@ -875,12 +875,10 @@ void ApplyStyleCommandImpl::applyStyleIfNeeded(const Position &insertionPoint)
     if (mustExlicitlyApplyStyle(insertionPoint)) {
         NodeImpl *styleNode = createExplicitApplyStyleNode();
         ASSERT(styleNode);
-        int exceptionCode = 0;
         NodeImpl *contentNode = insertionPoint.node();
         insertNodeBefore(styleNode, contentNode);
         removeNode(contentNode);
         appendNode(styleNode, contentNode);
-        ASSERT(exceptionCode == 0);
     }
 }
 

-- 
WebKit Debian packaging