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-tref.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-tref.cpp')
| -rw-r--r-- | src/sp-tref.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 0f6eb106f..6a229e170 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -492,12 +492,8 @@ sp_tref_convert_to_tspan(SPObject *obj) //SPObject * new_string_child = document->getObjectByRepr(new_string_repr); // Merge style from the tref - SPStyle *new_tspan_sty = new_tspan->style; - SPStyle const *tref_sty = tref->style; - sp_style_merge_from_dying_parent(new_tspan_sty, tref_sty); - sp_style_merge_from_parent(new_tspan_sty, new_tspan->parent->style); - - + new_tspan->style->merge( tref->style ); + new_tspan->style->cascade( new_tspan->parent->style ); new_tspan->updateRepr(); // Hold onto our SPObject and repr for now. |