|
 |
f085be |
From 763e3855caacbfc4818e70464bca348de10fbc3d Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Joren De Cuyper <jorendc@libreoffice.org>
|
|
|
f085be |
Date: Mon, 14 Jul 2014 17:57:06 +0200
|
|
|
f085be |
Subject: [PATCH 020/137] fdo#78554 - SVG: Text from SVG no longer displayed in
|
|
|
f085be |
LibreOffice
|
|
|
f085be |
MIME-Version: 1.0
|
|
|
f085be |
Content-Type: text/plain; charset=UTF-8
|
|
|
f085be |
Content-Transfer-Encoding: 8bit
|
|
|
f085be |
|
|
|
f085be |
regression of 3b7472b284131c09d91b69f26d5d26d54648f939
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I95a30acbf4b2684dda9684f5b51b887356a940e1
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10304
|
|
|
f085be |
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
|
f085be |
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
|
f085be |
---
|
|
|
f085be |
svgio/source/svgreader/svgsvgnode.cxx | 9 +++++++--
|
|
|
f085be |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
|
|
|
f085be |
index cde5387..f85318b 100644
|
|
|
f085be |
--- a/svgio/source/svgreader/svgsvgnode.cxx
|
|
|
f085be |
+++ b/svgio/source/svgreader/svgsvgnode.cxx
|
|
|
f085be |
@@ -60,8 +60,13 @@ namespace svgio
|
|
|
f085be |
|
|
|
f085be |
const SvgStyleAttributes* SvgSvgNode::getSvgStyleAttributes() const
|
|
|
f085be |
{
|
|
|
f085be |
- checkForCssStyle(OUString("svg"), maSvgStyleAttributes);
|
|
|
f085be |
- return maSvgStyleAttributes.getCssStyleParent();
|
|
|
f085be |
+ const SvgStyleAttributes* aCheckCssStyle = checkForCssStyle(OUString("svg"), maSvgStyleAttributes);
|
|
|
f085be |
+ const SvgStyleAttributes* aGetCssStyleParent = maSvgStyleAttributes.getCssStyleParent();
|
|
|
f085be |
+
|
|
|
f085be |
+ if (aGetCssStyleParent == NULL)
|
|
|
f085be |
+ return aCheckCssStyle;
|
|
|
f085be |
+
|
|
|
f085be |
+ return aGetCssStyleParent;
|
|
|
f085be |
}
|
|
|
f085be |
|
|
|
f085be |
void SvgSvgNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|