From 3598d85ed64693808296324289a2d6e5284d486e Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 25 Dec 2014 17:05:40 +0100
Subject: Remove sp_style_merge_from_parent() and
 sp_style_merge_from_dying_parent().

(bzr r13822.1.5)
---
 src/sp-use.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/sp-use.cpp')

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.
-- 
cgit v1.2.3