diff options
author | Armin Le Grand <alg@apache.org> | 2012-07-25 08:28:44 +0000 |
---|---|---|
committer | Xisco Fauli <anistenis@gmail.com> | 2013-04-14 17:52:33 +0200 |
commit | f75ca1fdad1094fbea4bb6cb0e3cc9458700c470 (patch) | |
tree | 8e99cbe055a075b77315985621b314884077a870 /svgio/source/svgreader/svgpolynode.cxx | |
parent | 1591194a5fc45cbd44c0f4cb022d8ff8c88e0a24 (diff) |
Fix #120334# Added support for multiple CSS styles per graphic primitive
(cherry picked from commit 37446076e684a0d0de448366ab927531e3b54bba)
Conflicts:
svgio/inc/svgio/svgreader/svgstyleattributes.hxx
svgio/source/svgreader/svgcirclenode.cxx
svgio/source/svgreader/svgellipsenode.cxx
svgio/source/svgreader/svggnode.cxx
svgio/source/svgreader/svgimagenode.cxx
svgio/source/svgreader/svglinenode.cxx
svgio/source/svgreader/svgmarkernode.cxx
svgio/source/svgreader/svgpathnode.cxx
svgio/source/svgreader/svgpatternnode.cxx
svgio/source/svgreader/svgpolynode.cxx
svgio/source/svgreader/svgrectnode.cxx
svgio/source/svgreader/svgstyleattributes.cxx
svgio/source/svgreader/svgtextnode.cxx
svgio/source/svgreader/svgusenode.cxx
Change-Id: Id554528932eea590d645cb5e5a1ea8cf7f1d0aac
Diffstat (limited to 'svgio/source/svgreader/svgpolynode.cxx')
-rw-r--r-- | svgio/source/svgreader/svgpolynode.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx index 3100fc30a00e..eef4808404dc 100644 --- a/svgio/source/svgreader/svgpolynode.cxx +++ b/svgio/source/svgreader/svgpolynode.cxx @@ -47,11 +47,9 @@ namespace svgio const SvgStyleAttributes* SvgPolyNode::getSvgStyleAttributes() const { - static OUString aClassStrA(OUString::createFromAscii("polygon")); - static OUString aClassStrB(OUString::createFromAscii("polyline")); - maSvgStyleAttributes.checkForCssStyle(mbIsPolyline? aClassStrB : aClassStrA); - - return &maSvgStyleAttributes; + static rtl::OUString aClassStrA(rtl::OUString::createFromAscii("polygon")); + static rtl::OUString aClassStrB(rtl::OUString::createFromAscii("polyline")); + return checkForCssStyle(mbIsPolyline? aClassStrB : aClassStrA, maSvgStyleAttributes); } void SvgPolyNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) |