diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-05-03 08:24:42 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-05-03 08:24:42 +0000 |
| commit | 9cd0e3e85ab25d2334b19e919de9487537b34f0d (patch) | |
| tree | 8b651fcefa3456ed71a5032c368a64909153d577 /src/selection-chemistry.cpp | |
| parent | Removed unnecessary inclusion of glibmm/threads.h (diff) | |
| parent | fix crash when setting clip (diff) | |
| download | inkscape-9cd0e3e85ab25d2334b19e919de9487537b34f0d.tar.gz inkscape-9cd0e3e85ab25d2334b19e919de9487537b34f0d.zip | |
merged trunk
(bzr r14059.1.15)
Diffstat (limited to 'src/selection-chemistry.cpp')
| -rw-r--r-- | src/selection-chemistry.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 6e03ff698..23468acc3 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -3884,17 +3884,18 @@ void sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_ items_to_select.push_back(*i); } } else { - GSList *i = NULL; - for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) { - apply_to_items = g_slist_prepend(apply_to_items, *i); - items_to_select.push_back(*i); + SPItem *i = NULL; + for (std::vector<SPItem*>::const_iterator j=items.begin();j!=items.end();j++) { + i=*j; + apply_to_items = g_slist_prepend(apply_to_items, i); + items_to_select.push_back(i); } - Inkscape::XML::Node *dup = SP_OBJECT(i->data)->getRepr()->duplicate(xml_doc); + Inkscape::XML::Node *dup = SP_OBJECT(i)->getRepr()->duplicate(xml_doc); mask_items = g_slist_prepend(mask_items, dup); if (remove_original) { - SPObject *item = reinterpret_cast<SPObject*>(i->data); + SPObject *item = reinterpret_cast<SPObject*>(i); items_to_delete = g_slist_prepend(items_to_delete, item); } } |