[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/charttypes/BarChart.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 9dde9d5b3ccea8130d032401d6e702a2e18eaaa5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jan 4 11:21:54 2014 +0100

    support fill color mapping in bar charts
    
    Change-Id: I2f2b273cb70a601ae7ea7b88cd76db5546e66982

diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 96386d8..5c57ecf 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -549,6 +549,8 @@ void BarChart::createShapes()
                     if(!pSeries)
                         continue;
 
+                    bool bHasFillColorMapping = pSeries->hasPropertyMapping("FillColor");
+
                     bOnlyConnectionLinesForThisPoint = false;
 
                     if(nPointIndex==nStartIndex)//do not create a regression line for each point
@@ -784,6 +786,13 @@ void BarChart::createShapes()
                                 xShape = m_pShapeFactory->createArea2D( xPointGroupShape_Shapes, aPoly );
                                 this->setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
                             }
+
+                            if(bHasFillColorMapping)
+                            {
+                                uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
+                                xProps->setPropertyValue("FillColor", uno::makeAny(static_cast<sal_Int32>(
+                                                pSeries->getValueByProperty(nPointIndex, "FillColor"))));
+                            }
                             //set name/classified ObjectID (CID)
                             ShapeFactory::setShapeName(xShape
                                 , ObjectIdentifier::createPointCID(