diff options
| -rw-r--r-- | oox/source/vml/vmltextbox.cxx | 6 | ||||
| -rw-r--r-- | oox/source/vml/vmltextboxcontext.cxx | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx index 3b81caf5908a..e3d07b8099ff 100644 --- a/oox/source/vml/vmltextbox.cxx +++ b/oox/source/vml/vmltextbox.cxx @@ -103,6 +103,12 @@ void TextBox::convert(uno::Reference<drawing::XShape> xShape) const aPropertyValue.Value = uno::makeAny(eAdjust); aPropVec.push_back(aPropertyValue); } + if (rFont.moColor.has()) + { + aPropertyValue.Name = "CharColor"; + aPropertyValue.Value = uno::makeAny(rFont.moColor.get().toUInt32(16)); + aPropVec.push_back(aPropertyValue); + } uno::Sequence<beans::PropertyValue> aPropSeq(aPropVec.size()); beans::PropertyValue* pValues = aPropSeq.getArray(); for (std::vector<beans::PropertyValue>::iterator i = aPropVec.begin(); i != aPropVec.end(); ++i) diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index 9fbf26cfeffe..d91c66ade821 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -129,6 +129,9 @@ void TextPortionContext::onStartElement(const AttributeList& rAttribs) case OOX_TOKEN(doc, br): mrTextBox.appendPortion( maParagraph, maFont, "\n" ); break; + case OOX_TOKEN(doc, color): + maFont.moColor = rAttribs.getString( OOX_TOKEN(doc, val) ); + break; } } |