diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-06-27 05:41:53 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-06-27 05:41:53 +0000 |
| commit | 6f008746350aab3d895a7905e1dd036a9b615a94 (patch) | |
| tree | 736226313250bc53a193b4f4cf516f6909efcc8e /src/selection-chemistry.cpp | |
| parent | fix issue introduced in r14229 (diff) | |
| download | inkscape-6f008746350aab3d895a7905e1dd036a9b615a94.tar.gz inkscape-6f008746350aab3d895a7905e1dd036a9b615a94.zip | |
switch SPStyle to using SPFilterReference for filters; sp_style_new now requires an SPDocument; SPURIReference and SPFilterReference have an alternative constructor taking an owner_document instead of owner object
(bzr r3116)
Diffstat (limited to 'src/selection-chemistry.cpp')
| -rw-r--r-- | src/selection-chemistry.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index ed8d6379e..27c04f1dd 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -73,6 +73,7 @@ #include "sp-item.h" #include "unit-constants.h" #include "xml/simple-document.h" +#include "sp-filter-reference.h" using NR::X; using NR::Y; @@ -952,8 +953,8 @@ void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList } } - if (style->filter.filter) { - SPObject *filter = style->filter.filter; + if (style->filter.href->getObject()) { + SPObject *filter = style->filter.href->getObject(); if (SP_IS_FILTER(filter)) { sp_copy_single (defs_clip, filter, xml_doc); } @@ -1082,7 +1083,7 @@ void sp_selection_copy() sp_selection_copy_impl (items, &clipboard, &defs_clipboard, &style_clipboard, clipboard_document); if (tools_isactive (desktop, TOOLS_TEXT)) { // take style from cursor/text selection, overwriting the style just set by copy_impl - SPStyle *const query = sp_style_new(); + SPStyle *const query = sp_style_new(SP_ACTIVE_DOCUMENT); if (sp_desktop_query_style_all (desktop, query)) { SPCSSAttr *css = sp_css_attr_from_style (query, SP_STYLE_FLAG_ALWAYS); if (css != NULL) { |