Code

patch by Martin von Gagern for bug 174720
authorbuliabyak <buliabyak@users.sourceforge.net>
Tue, 1 Apr 2008 21:29:54 +0000 (21:29 +0000)
committerbuliabyak <buliabyak@users.sourceforge.net>
Tue, 1 Apr 2008 21:29:54 +0000 (21:29 +0000)
src/style.cpp

index a50fedf6b673ec6abcb842c92d0d518abb5d020a..45a560d272db8a1f2de20433b7438660164d5c35 100644 (file)
@@ -2125,7 +2125,9 @@ static void
 sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
 {
     if ((paint->set && paint->currentcolor) || parent->currentcolor) {
+        bool isset = paint->set;
         paint->clear();
+        paint->set = isset;
         paint->currentcolor = TRUE;
         paint->setColor(style->color.value.color);
         return;
@@ -3016,6 +3018,7 @@ sp_style_read_icolor(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
         guint32 const rgb0 = sp_svg_read_color(str, 0xff);
         if (rgb0 != 0xff) {
             paint->setColor(rgb0);
+            paint->set = TRUE;
             paint->inherit = FALSE;
         }
     }