You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/01/10 16:27:36 UTC
svn commit: r1229595 - in /incubator/ooo/trunk/main/svgio/source/svgreader:
svgstyleattributes.cxx svgusenode.cxx
Author: alg
Date: Tue Jan 10 15:27:36 2012
New Revision: 1229595
URL: http://svn.apache.org/viewvc?rev=1229595&view=rev
Log:
#118699# Added text/css style support for use nodes; corrected text/css style identification when there is also an ID set
Modified:
incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
incubator/ooo/trunk/main/svgio/source/svgreader/svgusenode.cxx
Modified: incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1229595&r1=1229594&r2=1229595&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx (original)
+++ incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx Tue Jan 10 15:27:36 2012
@@ -210,11 +210,13 @@ namespace svgio
pNew = rDocument.findSvgStyleAttributesById(aId);
}
}
- else if(mrOwner.getId())
+
+ if(!pNew && mrOwner.getId())
{
pNew = rDocument.findSvgStyleAttributesById(*mrOwner.getId());
}
- else if(rClassStr.getLength())
+
+ if(!pNew && rClassStr.getLength())
{
pNew = rDocument.findSvgStyleAttributesById(rClassStr);
}
Modified: incubator/ooo/trunk/main/svgio/source/svgreader/svgusenode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/source/svgreader/svgusenode.cxx?rev=1229595&r1=1229594&r2=1229595&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/source/svgreader/svgusenode.cxx (original)
+++ incubator/ooo/trunk/main/svgio/source/svgreader/svgusenode.cxx Tue Jan 10 15:27:36 2012
@@ -53,6 +53,9 @@ namespace svgio
const SvgStyleAttributes* SvgUseNode::getSvgStyleAttributes() const
{
+ static rtl::OUString aClassStr(rtl::OUString::createFromAscii("use"));
+ maSvgStyleAttributes.checkForCssStyle(aClassStr);
+
return &maSvgStyleAttributes;
}