[Libreoffice-commits] .: oox/source

[Miklos Vajna]

 oox/source/token/properties.txt |    1 +
 oox/source/vml/vmlshape.cxx     |    9 +++++++++
 2 files changed, 10 insertions(+)

New commits:
commit 229f6e187bd85d0af47da9feffef2d9ac7f83120
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Jun 1 17:53:04 2012 +0200

    Related: fdo#46361 fix VML import of v:rect's fillcolor
    
    Change-Id: I530e07bb89f231b10c9e6da2eb4e6b698ee9654a

diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 2af9c8e..7330203 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -19,6 +19,7 @@ AttachedAxisIndex
 AutoFilter
 AutoShowInfo
 Autocomplete
+BackColor
 BackGraphicLocation
 BackGraphicURL
 Background
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 91e3d63..4e5e4ac 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -354,6 +354,15 @@ void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) con
     const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper();
     maTypeModel.maStrokeModel.pushToPropMap( aPropMap, rGraphicHelper );
     maTypeModel.maFillModel.pushToPropMap( aPropMap, rGraphicHelper );
+
+    // TextFrames have FillColor, not BackColor
+    uno::Reference<lang::XServiceInfo> xSInfo(rxShape, uno::UNO_QUERY_THROW);
+    if (xSInfo->supportsService("com.sun.star.text.TextFrame") && aPropMap.hasProperty(PROP_FillColor))
+    {
+        aPropMap.setProperty(PROP_BackColor, aPropMap[PROP_FillColor]);
+        aPropMap.erase(PROP_FillColor);
+    }
+
     PropertySet( rxShape ).setProperties( aPropMap );
 }