svgio/source/svgreader/svgsvgnode.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
New commits: commit eae269a60a0a571c4752a4b2a94ba728bb41c460 Author: Joren De Cuyper <jore...@libreoffice.org> Date: Mon Jul 14 17:57:06 2014 +0200 fdo#78554 - SVG: Text from SVG no longer displayed in LibreOffice regression of 3b7472b284131c09d91b69f26d5d26d54648f939 Change-Id: I95a30acbf4b2684dda9684f5b51b887356a940e1 Reviewed-on: https://gerrit.libreoffice.org/10303 Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> Tested-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index 50dbef7..73a5efb 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -58,8 +58,13 @@ namespace svgio const SvgStyleAttributes* SvgSvgNode::getSvgStyleAttributes() const { - checkForCssStyle(OUString("svg"), maSvgStyleAttributes); - return maSvgStyleAttributes.getCssStyleParent(); + const SvgStyleAttributes* aCheckCssStyle = checkForCssStyle(OUString("svg"), maSvgStyleAttributes); + const SvgStyleAttributes* aGetCssStyleParent = maSvgStyleAttributes.getCssStyleParent(); + + if (aGetCssStyleParent == NULL) + return aCheckCssStyle; + + return aGetCssStyleParent; } void SvgSvgNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits