DOCX drawingML import: handle char color from theme for shape text

When we import table styles, we apply that as direct formatting, in case
there is no real direct formatting, see lcl_ApplyCellProperties() in the
sw UNO implementation.

We can do the same here: in case there is no other formatting, then
apply the char color from the WPS theme, that will give us the expected
result.

Change-Id: Ic8e6afc09167f7924a11ab0b445351075f16738e

1 files changed, 13 insertions, 0 deletions

diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 4d5863873fd5..9e3218e5bfbc 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -111,6 +111,19 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
                 drawing::TextVerticalAdjust eAdjust = drawingml::GetTextVerticalAdjust(rAttribs.getToken(XML_anchor, XML_t));
                 xPropertySet->setPropertyValue("TextVerticalAdjust", uno::makeAny(eAdjust));
             }
+
+            // Apply character color of the shape to the shape's textbox.
+            uno::Reference<text::XText> xText(mxShape, uno::UNO_QUERY);
+            uno::Reference<text::XTextCursor> xTextCursor = xText->createTextCursor();
+            xTextCursor->gotoStart(false);
+            xTextCursor->gotoEnd(true);
+            const uno::Reference<beans::XPropertyState> xPropertyState(xTextCursor, uno::UNO_QUERY);
+            const beans::PropertyState ePropertyState = xPropertyState->getPropertyState("CharColor");
+            if (ePropertyState == beans::PropertyState_DEFAULT_VALUE)
+            {
+                uno::Reference<beans::XPropertySet> xTextBoxPropertySet(xTextCursor, uno::UNO_QUERY);
+                xTextBoxPropertySet->setPropertyValue("CharColor", xPropertySet->getPropertyValue("CharColor"));
+            }
             return this;
         }
         break;