summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-12-06 10:14:45 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-12-06 10:38:52 +0100
commita5c475c25bd432fc80be8c2b437935cd54c4b611 (patch)
tree6ac0ccd5bbca603211fcdfc24f65ab5d02228c56 /oox
parente661d295c2643d6706a9b2040051445591880c46 (diff)
Santa Claus brings fixed background color of textframes in drawingml import
Change-Id: Ie2b6885aae5e26c3d29d372da730837cb7dc97ce
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 78a7581858f4..72c75475c694 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -613,6 +613,12 @@ Reference< XShape > Shape::createAndInsert(
{
if (aServiceName == "com.sun.star.text.TextFrame")
{
+ // TextFrames have BackColor, not FillColor
+ if (aShapeProps.hasProperty(PROP_FillColor))
+ {
+ aShapeProps.setProperty(PROP_BackColor, aShapeProps[PROP_FillColor]);
+ aShapeProps.erase(PROP_FillColor);
+ }
// TextFrames have BackColorTransparency, not FillTransparence
if (aShapeProps.hasProperty(PROP_FillTransparence))
{