[Libreoffice-commits] core.git: svgio/inc svgio/source

[Xisco Faulí]

 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |    2 +-
 svgio/source/svgreader/svgstyleattributes.cxx    |   17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 85fcf15ff41ceb95f46dee586ff7187551be4955
Author: Xisco Faulí <anistenis at gmail.com>
Date:   Sat Feb 27 00:17:25 2016 +0000

    Revert "SVGIO: tdf#97539: clip-path elements might contain..."
    
    This reverts commit 7b7ffedfa6357b902a5e354d986dac39a3b2f462.
    
    Change-Id: I018830e17cb83c5fe3574b76939673877ac2004d
    Reviewed-on: https://gerrit.libreoffice.org/22726
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <anistenis at gmail.com>

diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 011b5f3..33258d5 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -441,7 +441,7 @@ namespace svgio
             void setDesc(const OUString& rNew) { maDesc = rNew; }
 
             // ClipPathXLink content
-            OUString getClipPathXLink() const;
+            const OUString getClipPathXLink() const { return maClipPathXLink; }
 
             // MaskXLink content
             const OUString getMaskXLink() const { return maMaskXLink; }
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 56a1ac5..3e454e4 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2659,23 +2659,6 @@ namespace svgio
             return nullptr;
         }
 
-        OUString SvgStyleAttributes::getClipPathXLink() const
-        {
-            if(!maClipPathXLink.isEmpty())
-            {
-                return maClipPathXLink;
-            }
-
-            const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
-
-            if(pSvgStyleAttributes)
-            {
-                return pSvgStyleAttributes->getClipPathXLink();
-            }
-
-            return OUString();
-        }
-
         OUString SvgStyleAttributes::getMarkerStartXLink() const
         {
             if(!maMarkerStartXLink.isEmpty())