adapt to new paintservers API of SPStyle

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 94221ba546fb4eb0c2d42dddb5ac7fcbd8ee938b..1634db367e4907fea28018e790c369ab2e53e4d9 100644 (file)
--- 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 a31363f9a8abd327cce446caa2fd22a7f31e3856..f0de2d26f7bc55ee6a4a89c3cab4d4e8dd4bab2d 100644 (file)
--- 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: {