summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorXisco Faulí <anistenis@gmail.com>2016-02-27 00:17:25 +0000
committerXisco Faulí <anistenis@gmail.com>2016-02-27 09:24:12 +0000
commit85fcf15ff41ceb95f46dee586ff7187551be4955 (patch)
tree4e9348014146e08901f59faa608c9e1b0bec369b /svgio
parentaf57a81d0c28944b424649f024c28f444a1ab2d9 (diff)
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@libreoffice.org> Reviewed-by: Xisco Faulí <anistenis@gmail.com>
Diffstat (limited to 'svgio')
-rw-r--r--svgio/inc/svgio/svgreader/svgstyleattributes.hxx2
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx17
2 files changed, 1 insertions, 18 deletions
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 011b5f3bc98f..33258d5dde90 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 56a1ac5235eb..3e454e4babc7 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())