From dd957026bd798ebe34eff033b4a839d63b790b04 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Sun, 4 Aug 2013 16:27:59 +0200
Subject: cppcheck

(bzr r12467)
---
 src/attribute-rel-util.cpp | 55 +++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

(limited to 'src/attribute-rel-util.cpp')

diff --git a/src/attribute-rel-util.cpp b/src/attribute-rel-util.cpp
index 0527dad4e..933339632 100644
--- a/src/attribute-rel-util.cpp
+++ b/src/attribute-rel-util.cpp
@@ -198,23 +198,22 @@ void sp_attribute_clean_style(Node* repr, SPCSSAttr *css, unsigned int flags) {
 
     // Check if a property is applicable to an element (i.e. is font-family useful for a <rect>?).
     if( !SPAttributeRelCSS::findIfValid( property, element ) ) {
-      if( flags & SP_ATTR_CLEAN_STYLE_WARN ) {
-	g_warning( "<%s id=\"%s\">: CSS Style property: \"%s\" is inappropriate.",
-		   element.c_str(), id.c_str(), property );
-      }
-      if( flags & SP_ATTR_CLEAN_STYLE_REMOVE ) {
-	toDelete.insert(property);
-      }
-      continue;
+        if( flags & SP_ATTR_CLEAN_STYLE_WARN ) {
+            g_warning( "<%s id=\"%s\">: CSS Style property: \"%s\" is inappropriate.",
+                       element.c_str(), id.c_str(), property );
+        }
+        if( flags & SP_ATTR_CLEAN_STYLE_REMOVE ) {
+            toDelete.insert(property);
+        }
+        continue;
     }
 
     // Find parent value for same property (property)
     gchar const * value_p = NULL;
     if( css_parent != NULL ) {
-        gchar const * property_p = NULL;
         for ( List<AttributeRecord const> iter_p = css_parent->attributeList() ; iter_p ; ++iter_p ) {
 
-            property_p = g_quark_to_string(iter_p->key);
+            gchar const * property_p = g_quark_to_string(iter_p->key);
 
             if( !g_strcmp0( property, property_p ) ) {
                 value_p = iter_p->value;
@@ -226,29 +225,29 @@ void sp_attribute_clean_style(Node* repr, SPCSSAttr *css, unsigned int flags) {
     // If parent has same property value and property is inherited, mark for deletion.
     if ( !g_strcmp0( value, value_p ) && SPAttributeRelCSS::findIfInherit( property ) ) {
 
-      if ( flags & SP_ATTR_CLEAN_DEFAULT_WARN ) {
-	g_warning( "<%s id=\"%s\">: CSS Style property: \"%s\" has same value as parent (%s).",
-		   element.c_str(), id.c_str(), property, value );
-      }
-      if ( flags & SP_ATTR_CLEAN_DEFAULT_REMOVE ) {
-	toDelete.insert( property );
-      }
-      continue;
+        if ( flags & SP_ATTR_CLEAN_DEFAULT_WARN ) {
+            g_warning( "<%s id=\"%s\">: CSS Style property: \"%s\" has same value as parent (%s).",
+                       element.c_str(), id.c_str(), property, value );
+        }
+        if ( flags & SP_ATTR_CLEAN_DEFAULT_REMOVE ) {
+            toDelete.insert( property );
+        }
+        continue;
     }
 
     // If property value is same as default and the parent value not set or property is not inherited,
     // mark for deletion.
     if ( SPAttributeRelCSS::findIfDefault( property, value ) &&
-	 ( (css_parent != NULL && value_p == NULL) || !SPAttributeRelCSS::findIfInherit( property ) ) ) {
-
-      if ( flags & SP_ATTR_CLEAN_DEFAULT_WARN ) {
-	g_warning( "<%s id=\"%s\">: CSS Style property: \"%s\" with default value (%s) not needed.",
-		   element.c_str(), id.c_str(), property, value );
-      }
-      if ( flags & SP_ATTR_CLEAN_DEFAULT_REMOVE ) {
-	toDelete.insert( property );
-      }
-      continue;
+         ( (css_parent != NULL && value_p == NULL) || !SPAttributeRelCSS::findIfInherit( property ) ) ) {
+
+        if ( flags & SP_ATTR_CLEAN_DEFAULT_WARN ) {
+            g_warning( "<%s id=\"%s\">: CSS Style property: \"%s\" with default value (%s) not needed.",
+                       element.c_str(), id.c_str(), property, value );
+        }
+        if ( flags & SP_ATTR_CLEAN_DEFAULT_REMOVE ) {
+            toDelete.insert( property );
+        }
+        continue;
     }
 
   } // End loop over style properties
-- 
cgit v1.2.3


From 451210ce988fb6e6964bd4869f74ffa7fb2c462d Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 15 Aug 2013 21:13:44 +0200
Subject: Prevent writing out empty style strings.

(bzr r12481)
---
 src/attribute-rel-util.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/attribute-rel-util.cpp')

diff --git a/src/attribute-rel-util.cpp b/src/attribute-rel-util.cpp
index 933339632..15c71daa7 100644
--- a/src/attribute-rel-util.cpp
+++ b/src/attribute-rel-util.cpp
@@ -141,7 +141,11 @@ void sp_attribute_clean_style(Node *repr, unsigned int flags) {
   // sp_repr_css_set( repr, css, "style"); // Don't use as it will cause loop.
   Glib::ustring value;
   sp_repr_css_write_string(css, value);
-  repr->setAttribute("style", value.c_str());
+  if( value.empty() ) {
+      repr->setAttribute("style", NULL );
+  } else {
+      repr->setAttribute("style", value.c_str());
+  }
 
   sp_repr_css_attr_unref( css );
 }
-- 
cgit v1.2.3