now that selection description includes style (filtered, clipped), we need to update...

[inkscape.git] / src / sp-item-group.cpp

diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index d0338f369ecc8bba93bd5d6632f308ddd062b97f..862a36cb065888c7ba178fe561be9375ebf2e459 100644 (file)
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -367,7 +367,7 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
     g_return_if_fail (!strcmp (grepr->name(), "svg:g") || !strcmp (grepr->name(), "svg:a") || !strcmp (grepr->name(), "svg:switch"));
 
       // this converts the gradient/pattern fill/stroke on the group, if any, to userSpaceOnUse
-      sp_item_adjust_paint_recursive (gitem, NR::identity(), NR::identity(), false);
+      sp_item_adjust_paint_recursive (gitem, Geom::identity(), Geom::identity(), false);
 
     SPItem *pitem = SP_ITEM (SP_OBJECT_PARENT (gitem));
     Inkscape::XML::Node *prepr = SP_OBJECT_REPR (pitem);
@@ -391,7 +391,7 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
             /* Merging of style */
             // this converts the gradient/pattern fill/stroke, if any, to userSpaceOnUse; we need to do
             // it here _before_ the new transform is set, so as to use the pre-transform bbox
-            sp_item_adjust_paint_recursive (citem, NR::identity(), NR::identity(), false);
+            sp_item_adjust_paint_recursive (citem, Geom::identity(), Geom::identity(), false);
 
             sp_style_merge_from_dying_parent(SP_OBJECT_STYLE(child), SP_OBJECT_STYLE(gitem));
             /*
@@ -504,15 +504,12 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
 GSList *
 sp_item_group_item_list (SPGroup * group)
 {
-        GSList *s;
-    SPObject *o;
-
     g_return_val_if_fail (group != NULL, NULL);
     g_return_val_if_fail (SP_IS_GROUP (group), NULL);
 
-    s = NULL;
+    GSList *s = NULL;
 
-    for ( o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
+    for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
         if (SP_IS_ITEM (o)) {
             s = g_slist_prepend (s, o);
         }
@@ -701,7 +698,7 @@ void CGroup::onModified(guint flags) {
 
 void CGroup::calculateBBox(NRRect *bbox, Geom::Matrix const &transform, unsigned const flags) {
 
-    boost::optional<Geom::Rect> dummy_bbox;
+    Geom::OptRect dummy_bbox;
 
     GSList *l = _group->childList(false, SPObject::ActionBBox);
     while (l) {
@@ -836,7 +833,7 @@ sp_group_update_patheffect (SPLPEItem *lpeitem, bool write)
         for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); it++)
         {
             LivePathEffectObject *lpeobj = (*it)->lpeobject;
-            if (lpeobj->get_lpe()) {
+            if (lpeobj && lpeobj->get_lpe()) {
                 lpeobj->get_lpe()->doBeforeEffect(lpeitem);
             }
         }