summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2016-03-30 01:52:32 +0200
committerXisco FaulĂ­ <anistenis@gmail.com>2016-03-30 08:43:08 +0000
commit2c29716d349353997bf7cdde63cd9f867c5baeb6 (patch)
tree8835d69d8de0795fa72eac6f3388168eb412e7f4
parentf8f87780f5f7be5ff185b0b8b3206d760d9dfed6 (diff)
tdf#97657: SVGIO: Don't iterate over parent's clip-paths...
... when it's a clip-path content Change-Id: I222b429a61409d9670b9d60357895542a15afc15 Reviewed-on: https://gerrit.libreoffice.org/23624 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Xisco FaulĂ­ <anistenis@gmail.com>
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index e04999d9f1e9..36b4e304e25c 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2639,6 +2639,11 @@ namespace svgio
OUString SvgStyleAttributes::getClipPathXLink() const
{
+ if(mbIsClipPathContent)
+ {
+ return maClipPathXLink;
+ }
+
if(!maClipPathXLink.isEmpty())
{
return maClipPathXLink;
@@ -2662,7 +2667,7 @@ namespace svgio
if(!aClipPath.isEmpty())
{
- const_cast< SvgStyleAttributes* >(this)->mpClipPathXLink = dynamic_cast< const SvgClipPathNode* >(mrOwner.getDocument().findSvgNodeById(getClipPathXLink()));
+ const_cast< SvgStyleAttributes* >(this)->mpClipPathXLink = dynamic_cast< const SvgClipPathNode* >(mrOwner.getDocument().findSvgNodeById(aClipPath));
}
}
@@ -2694,7 +2699,7 @@ namespace svgio
if(!aMask.isEmpty())
{
- const_cast< SvgStyleAttributes* >(this)->mpMaskXLink = dynamic_cast< const SvgMaskNode* >(mrOwner.getDocument().findSvgNodeById(getMaskXLink()));
+ const_cast< SvgStyleAttributes* >(this)->mpMaskXLink = dynamic_cast< const SvgMaskNode* >(mrOwner.getDocument().findSvgNodeById(aMask));
}
}