diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-12-26 18:49:12 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-12-26 18:49:12 +0000 |
| commit | 74f6d0cf39c974ca1980a7be7742f2154d2025f2 (patch) | |
| tree | f98b503be33ccc32c1074c5c670a0cd9b5fb5332 /src/sp-use.cpp | |
| parent | Documentation. Fix for bug #1405653 (Outdated links in hacking doc). (diff) | |
| parent | SPStyle ref counting clean up. (diff) | |
| download | inkscape-74f6d0cf39c974ca1980a7be7742f2154d2025f2.tar.gz inkscape-74f6d0cf39c974ca1980a7be7742f2154d2025f2.zip | |
Replace sp_style_xxx functions with SPStyle member functions.
Fix a bunch of memory leaks. One leak still remaining in Layout::appendText.
(bzr r13824)
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. |