[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svgio/source

[Xisco Fauli]

 svgio/source/svgreader/svgstyleattributes.cxx |   19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

New commits:
commit f7eeb3fc1dc5d072dbfd22b68cc51f3a2c8ef8b0
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Fri Dec 16 14:52:18 2016 +0100

    tdf#104339 Partially revert d5649ae7b76278cb3155f951d6327157c7c92b65
    
    Change-Id: I5160c6efe7cf58351955d9d1d3066e3b33bdfe20
    Reviewed-on: https://gerrit.libreoffice.org/32082
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 5903235d57acb13d9d5286d23b443a01aeab9a3c)
    Reviewed-on: https://gerrit.libreoffice.org/32146
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 948f361..8cb6bb5 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2677,24 +2677,7 @@ namespace svgio
 
         OUString SvgStyleAttributes::getClipPathXLink() const
         {
-            if(mbIsClipPathContent)
-            {
-                return maClipPathXLink;
-            }
-
-            if(!maClipPathXLink.isEmpty())
-            {
-                return maClipPathXLink;
-            }
-
-            const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
-
-            if(pSvgStyleAttributes && !pSvgStyleAttributes->maClipPathXLink.isEmpty())
-            {
-                return pSvgStyleAttributes->getClipPathXLink();
-            }
-
-            return OUString();
+            return maClipPathXLink;
         }
 
         const SvgClipPathNode* SvgStyleAttributes::accessClipPathXLink() const