diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-12-25 16:05:40 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-12-25 16:05:40 +0000 |
| commit | 3598d85ed64693808296324289a2d6e5284d486e (patch) | |
| tree | 41d6829e1d3eecdf03c276b868e725c644312628 /src/sp-use.cpp | |
| parent | Remove sp_style_write_string() and sp_style_write_difference(). (diff) | |
| download | inkscape-3598d85ed64693808296324289a2d6e5284d486e.tar.gz inkscape-3598d85ed64693808296324289a2d6e5284d486e.zip | |
Remove sp_style_merge_from_parent() and sp_style_merge_from_dying_parent().
(bzr r13822.1.5)
Diffstat (limited to 'src/sp-use.cpp')
| -rw-r--r-- | src/sp-use.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/sp-use.cpp b/src/sp-use.cpp index ba3f4a9d7..9b38a91c5 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -664,11 +664,8 @@ SPItem *SPUse::unlink() { SPObject *unlinked = document->getObjectByRepr(copy); // Merge style from the use. - SPStyle *unli_sty = unlinked->style; - SPStyle const *use_sty = this->style; - sp_style_merge_from_dying_parent(unli_sty, use_sty); - sp_style_merge_from_parent(unli_sty, unlinked->parent->style); - + unlinked->style->merge( this->style ); + unlinked->style->cascade( unlinked->parent->style ); unlinked->updateRepr(); // Hold onto our SPObject and repr for now. |