Kaydet (Commit) 3d3401a6 authored tarafından Joren De Cuyper's avatar Joren De Cuyper Kaydeden (comit) Tomaž Vajngerl

Revert "fdo#74743 avoid infinite loop when gathering "svg" element styles"

This reverts commit 3b7472b2.
Commit 0879a639 didn't
revert all changes, so we ran into problems getting the
css style correctly.

Conflicts:
	svgio/source/svgreader/svgstyleattributes.cxx
	svgio/source/svgreader/svgsvgnode.cxx

Change-Id: I4d17c6d599482de005c009638d03ca851491f700
Reviewed-on: https://gerrit.libreoffice.org/10455Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
Tested-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst 9c7a7d85
...@@ -203,15 +203,16 @@ namespace svgio ...@@ -203,15 +203,16 @@ namespace svgio
const SvgStyleAttributes* SvgStyleAttributes::getParentStyle() const const SvgStyleAttributes* SvgStyleAttributes::getParentStyle() const
{ {
const SvgStyleAttributes* pParentStyle = getCssStyleParent(); if(getCssStyleParent())
{
return getCssStyleParent();
}
if(mrOwner.supportsParentStyle() && mrOwner.getParent()) if(mrOwner.getParent())
{ {
return mrOwner.getParent()->getSvgStyleAttributes(); return mrOwner.getParent()->getSvgStyleAttributes();
} }
if (pParentStyle != this) // to prevent infinite loop
return pParentStyle;
return NULL; return NULL;
} }
......
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