diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-07-01 13:59:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-02 11:55:43 +0200 |
| commit | ef53d4aec2a3d690de2c7cdaf73ca95bbe29a433 (patch) | |
| tree | c02823bb3d8dad38acbfe518a548c4e720f7ee48 /oox | |
| parent | 5a737fca37cd5a5f90aa03a30688d447677d3b8a (diff) | |
fdo#46361 oox: handle w:color for groupshape textboxes
Change-Id: Ifcbf622a04a4b3f06d95c079d5e13ec3f505268f
Diffstat (limited to 'oox')
| -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; } } |