From 2aaa984133a62ac2ab21658abc494ec5da3c8cc9 Mon Sep 17 00:00:00 2001 From: bulia byak Date: Wed, 4 Jul 2007 01:30:14 +0000 Subject: adapt to new paintservers API of SPStyle (bzr r3181) --- src/desktop-style.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/desktop-style.cpp') 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 } -- cgit v1.2.3