diff options
| author | Joren De Cuyper <jorendc@libreoffice.org> | 2014-07-14 17:57:06 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-07-22 11:43:42 +0200 |
| commit | 1e3ad8c201f79a007649dfcb046eb317bd97795c (patch) | |
| tree | 02e306af41a26c8a1cd2c3c11fe9f2c494b4b629 /svgio | |
| parent | e03d61099eda9ba5f40cb589436b2d817c77a64f (diff) | |
fdo#78554 - SVG: Text from SVG no longer displayed in LibreOffice
regression of 3b7472b284131c09d91b69f26d5d26d54648f939
Change-Id: I95a30acbf4b2684dda9684f5b51b887356a940e1
Reviewed-on: https://gerrit.libreoffice.org/10304
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svgio')
| -rw-r--r-- | svgio/source/svgreader/svgsvgnode.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index cde53879a879..f85318b56116 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -60,8 +60,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) |