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

List:       kde-commits
Subject:    kdelibs/khtml/html
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2004-12-21 15:31:22
Message-ID: 20041221153122.8EF791CF49 () office ! kde ! org
[Download RAW message or body]

CVS commit by carewolf: 

Don't parse empty width and height as 0
CCBUG: 79731


  M +17 -11    html_baseimpl.cpp   1.203
  M +8 -2      html_imageimpl.cpp   1.148
  M +8 -2      html_objectimpl.cpp   1.124


--- kdelibs/khtml/html/html_baseimpl.cpp  #1.202:1.203
@@ -578,8 +578,14 @@ void HTMLIFrameElementImpl::parseAttribu
   {
     case ATTR_WIDTH:
-      addCSSLength( CSS_PROP_WIDTH, attr->value());
+        if (!attr->value().isEmpty())
+            addCSSLength(CSS_PROP_WIDTH, attr->value());
+        else
+            removeCSSProperty(CSS_PROP_WIDTH);
       break;
     case ATTR_HEIGHT:
-      addCSSLength( CSS_PROP_HEIGHT, attr->value() );
+        if (!attr->value().isEmpty())
+            addCSSLength(CSS_PROP_HEIGHT, attr->value());
+        else
+            removeCSSProperty(CSS_PROP_HEIGHT);
       break;
     case ATTR_SRC:

--- kdelibs/khtml/html/html_objectimpl.cpp  #1.123:1.124
@@ -77,8 +77,14 @@ void HTMLObjectBaseElementImpl::parseAtt
             break;
         case ATTR_WIDTH:
-            addCSSLength( CSS_PROP_WIDTH, attr->value());
+            if (!attr->value().isEmpty())
+                addCSSLength(CSS_PROP_WIDTH, attr->value());
+            else
+                removeCSSProperty(CSS_PROP_WIDTH);
             break;
         case ATTR_HEIGHT:
-            addCSSLength( CSS_PROP_HEIGHT, attr->value());
+            if (!attr->value().isEmpty())
+                addCSSLength(CSS_PROP_HEIGHT, attr->value());
+            else
+                removeCSSProperty(CSS_PROP_HEIGHT);
             break;
         default:

--- kdelibs/khtml/html/html_imageimpl.cpp  #1.147:1.148
@@ -80,8 +80,14 @@ void HTMLImageElementImpl::parseAttribut
         break;
     case ATTR_WIDTH:
+        if (!attr->value().isEmpty())
         addCSSLength(CSS_PROP_WIDTH, attr->value());
+        else
+            removeCSSProperty(CSS_PROP_WIDTH);
         break;
     case ATTR_HEIGHT:
+        if (!attr->value().isEmpty())
         addCSSLength(CSS_PROP_HEIGHT, attr->value());
+        else
+            removeCSSProperty(CSS_PROP_HEIGHT);
         break;
     case ATTR_BORDER:


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