summaryrefslogtreecommitdiffstats
path: root/src/desktop-style.cpp
diff options
context:
space:
mode:
authorbulia byak <buliabyak@gmail.com>2007-07-04 01:30:14 +0000
committerbuliabyak <buliabyak@users.sourceforge.net>2007-07-04 01:30:14 +0000
commit2aaa984133a62ac2ab21658abc494ec5da3c8cc9 (patch)
tree6793236709e7f0379e7fae56d86e118314546719 /src/desktop-style.cpp
parentswitch fill/stroke paintservers to URIReferences, properly disconnect and del... (diff)
downloadinkscape-2aaa984133a62ac2ab21658abc494ec5da3c8cc9.tar.gz
inkscape-2aaa984133a62ac2ab21658abc494ec5da3c8cc9.zip
adapt to new paintservers API of SPStyle
(bzr r3181)
Diffstat (limited to 'src/desktop-style.cpp')
-rw-r--r--src/desktop-style.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 94221ba54..1634db367 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -37,7 +37,6 @@
#include "xml/repr.h"
#include "libnrtype/font-style-to-pos.h"
-
#include "desktop-style.h"
/**
@@ -499,14 +498,14 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
num ++;
}
+ paint_res->type = paint->type;
if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { // copy the server
if (isfill) {
- SP_STYLE_FILL_SERVER (style_res) = SP_STYLE_FILL_SERVER (style);
+ sp_style_set_to_uri_string (style_res, true, style->getFillURI());
} else {
- SP_STYLE_STROKE_SERVER (style_res) = SP_STYLE_STROKE_SERVER (style);
+ sp_style_set_to_uri_string (style_res, false, style->getStrokeURI());
}
}
- paint_res->type = paint->type;
paint_res->set = paint_effectively_set;
style_res->fill_rule.computed = style->fill_rule.computed; // no averaging on this, just use the last one
}