From 447f436a87440c48403fb19a69aab49ee3dda2b2 Mon Sep 17 00:00:00 2001 From: buliabyak Date: Wed, 4 Jul 2007 01:30:14 +0000 Subject: [PATCH] adapt to new paintservers API of SPStyle --- src/desktop-style.cpp | 7 +++---- src/display/nr-arena-shape.cpp | 4 ++-- 2 files changed, 5 insertions(+), 6 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 } diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index a31363f9a..f0de2d26f 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -1282,7 +1282,7 @@ nr_arena_shape_set_style(NRArenaShape *shape, SPStyle *style) break; } case SP_PAINT_TYPE_PAINTSERVER: { - shape->setFill(style->fill.value.paint.server); + shape->setFill(style->getFillPaintServer()); break; } default: { @@ -1314,7 +1314,7 @@ nr_arena_shape_set_style(NRArenaShape *shape, SPStyle *style) break; } case SP_PAINT_TYPE_PAINTSERVER: { - shape->setStroke(style->stroke.value.paint.server); + shape->setStroke(style->getStrokePaintServer()); break; } default: { -- 2.30.2