Kaydet (Commit) 2c29716d authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Xisco Faulí

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/23624Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarXisco Faulí <anistenis@gmail.com>
üst f8f87780
...@@ -2639,6 +2639,11 @@ namespace svgio ...@@ -2639,6 +2639,11 @@ namespace svgio
OUString SvgStyleAttributes::getClipPathXLink() const OUString SvgStyleAttributes::getClipPathXLink() const
{ {
if(mbIsClipPathContent)
{
return maClipPathXLink;
}
if(!maClipPathXLink.isEmpty()) if(!maClipPathXLink.isEmpty())
{ {
return maClipPathXLink; return maClipPathXLink;
...@@ -2662,7 +2667,7 @@ namespace svgio ...@@ -2662,7 +2667,7 @@ namespace svgio
if(!aClipPath.isEmpty()) 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 ...@@ -2694,7 +2699,7 @@ namespace svgio
if(!aMask.isEmpty()) 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));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment