summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorbulia byak <buliabyak@gmail.com>2008-04-08 18:42:56 +0000
committerbuliabyak <buliabyak@users.sourceforge.net>2008-04-08 18:42:56 +0000
commita6b2b679dbe0faa9c636e8b32e214f4c502276d8 (patch)
tree3c5361128b57abbebbf4fb0571c4d16adfec8cab /src/style.cpp
parentcommit patch for LaTeX extension. fixes bug #195052 (diff)
downloadinkscape-a6b2b679dbe0faa9c636e8b32e214f4c502276d8.tar.gz
inkscape-a6b2b679dbe0faa9c636e8b32e214f4c502276d8.zip
another currentColor fix from bug 174720
(bzr r5389)
Diffstat (limited to 'src/style.cpp')
-rw-r--r--src/style.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/style.cpp b/src/style.cpp
index 46ff51e18..97781737e 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -3646,7 +3646,7 @@ sp_style_write_ipaint(gchar *b, gint const len, gchar const *const key,
css << "currentColor";
}
- if ( paint->colorSet ) {
+ if ( paint->colorSet && !paint->currentcolor ) {
if ( !css.str().empty() ) {
css << " ";
}
@@ -3655,7 +3655,7 @@ sp_style_write_ipaint(gchar *b, gint const len, gchar const *const key,
css << color_buf;
}
- if (paint->value.color.icc) {
+ if (paint->value.color.icc && !paint->currentcolor) {
if ( !css.str().empty() ) {
css << " ";
}