[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdelibs/khtml
From:       Germain Garand <germain () ebooksfrance ! org>
Date:       2008-10-19 22:27:10
Message-ID: 1224455230.347707.5981.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 873667 by ggarand:

manually merged r865829

address remaining remarks by C.Bartoscheck except the fall through
comments in bidi.cpp, which would deserve further investigation.



 M  +1 -0      html/html_baseimpl.cpp  
 M  +1 -0      html/html_imageimpl.cpp  
 M  +2 -1      xml/dom_selection.cpp  
 M  +1 -2      xml/xml_tokenizer.cpp  


--- branches/KDE/4.1/kdelibs/khtml/html/html_baseimpl.cpp #873666:873667
@@ -731,6 +731,7 @@
     {
         m_frame = (!attr->val() || attr->value().toInt() > 0);
         if (attached()) updateFrame();
+        break;
     }
     default:
         HTMLFrameElementImpl::parseAttribute( attr );
--- branches/KDE/4.1/kdelibs/khtml/html/html_imageimpl.cpp #873666:873667
@@ -157,6 +157,7 @@
             usemap = url;
         }
         m_hasAnchor = attr->val() != 0;
+        break;
     case ATTR_ISMAP:
         ismap = true;
         break;
--- branches/KDE/4.1/kdelibs/khtml/xml/dom_selection.cpp #873666:873667
@@ -824,7 +824,8 @@
         while (renderNode && renderNode->isInline())
             renderNode = renderNode->parent();
 
-        renderNode = renderNode->firstChild();
+        if (renderNode)
+            renderNode = renderNode->firstChild();
 
         NodeImpl *startNode = 0;
         NodeImpl *endNode = 0;
--- branches/KDE/4.1/kdelibs/khtml/xml/xml_tokenizer.cpp #873666:873667
@@ -499,8 +499,7 @@
         // fact we are using a known tag set)
         doc->appendChild(html,exceptioncode);
         html->appendChild(body,exceptioncode);
-        if ( body )
-            body->appendChild(h1,exceptioncode);
+        body->appendChild(h1,exceptioncode);
         h1->appendChild(headingText,exceptioncode);
         body->appendChild(errorText,exceptioncode);
         body->appendChild(hr,exceptioncode);
[prev in list] [next in list] [prev in thread] [next in thread]