diff options
| author | Joren De Cuyper <jorendc@libreoffice.org> | 2014-07-14 17:57:06 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2014-07-14 16:17:40 +0000 |
| commit | f6df52aa3aad9c7650b6ca051d9a28c4ccb6a060 (patch) | |
| tree | 20676d524ea1ed489155da51816d5104dd65bd44 | |
| parent | 37c3cf70c724b7402588d1d32d3aa76a965ee41b (diff) | |
fdo#78554 - SVG: Text from SVG no longer displayed in LibreOffice
regression of 3b7472b284131c09d91b69f26d5d26d54648f939
Change-Id: I95a30acbf4b2684dda9684f5b51b887356a940e1
Reviewed-on: https://gerrit.libreoffice.org/10302
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
| -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 50dbef752131..73a5efbdda9e 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) |