use an accessor method to get filter from style

(bzr r3145)

3 files changed, 9 insertions, 9 deletions

diff --git a/src/display/nr-arena-group.cpp b/src/display/nr-arena-group.cpp
index 3f08f42f4..912992a6e 100644
--- a/src/display/nr-arena-group.cpp
+++ b/src/display/nr-arena-group.cpp
@@ -196,12 +196,12 @@ void nr_arena_group_set_style (NRArenaGroup *group, SPStyle *style)
     group->style = style;
 
     //if group has a filter
-    if (style->filter.set && style->filter.href->getObject()) {
+    if (style->filter.set && style->getFilter()) {
         if (!group->filter) {
-            int primitives = sp_filter_primitive_count(style->filter.href->getObject());
+            int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
             group->filter = new NR::Filter(primitives);
         }
-        sp_filter_build_renderer(style->filter.href->getObject(), group->filter);
+        sp_filter_build_renderer(SP_FILTER(style->getFilter()), group->filter);
     } else {
         //no filter set for this group
         delete group->filter;
diff --git a/src/display/nr-arena-image.cpp b/src/display/nr-arena-image.cpp
index 87cc94e1b..e388fca1d 100644
--- a/src/display/nr-arena-image.cpp
+++ b/src/display/nr-arena-image.cpp
@@ -369,12 +369,12 @@ void nr_arena_image_set_style (NRArenaImage *image, SPStyle *style)
     image->style = style;
 
     //if image has a filter
-    if (style->filter.set && style->filter.href->getObject()) {
+    if (style->filter.set && style->getFilter()) {
         if (!image->filter) {
-            int primitives = sp_filter_primitive_count(style->filter.href->getObject());
+            int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
             image->filter = new NR::Filter(primitives);
         }
-        sp_filter_build_renderer(style->filter.href->getObject(), image->filter);
+        sp_filter_build_renderer(SP_FILTER(style->getFilter()), image->filter);
     } else {
         //no filter set for this image
         delete image->filter;
diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp
index 0e7dd2798..a31363f9a 100644
--- a/src/display/nr-arena-shape.cpp
+++ b/src/display/nr-arena-shape.cpp
@@ -1360,12 +1360,12 @@ nr_arena_shape_set_style(NRArenaShape *shape, SPStyle *style)
     shape->setMitreLimit(style->stroke_miterlimit.value);
 
     //if shape has a filter
-    if (style->filter.set && style->filter.href->getObject()) {
+    if (style->filter.set && style->getFilter()) {
         if (!shape->filter) {
-            int primitives = sp_filter_primitive_count(style->filter.href->getObject());
+            int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
             shape->filter = new NR::Filter(primitives);
         }
-        sp_filter_build_renderer(style->filter.href->getObject(), shape->filter);
+        sp_filter_build_renderer(SP_FILTER(style->getFilter()), shape->filter);
     } else {
         //no filter set for this shape
         delete shape->filter;