chart2/source/view/charttypes/PieChart.cxx | 9 +++++++++ chart2/source/view/main/VDataSeries.cxx | 1 - 2 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit 91aa36984d00adfbf9f64c2a3d02e61450cbf3b1 Author: Markus Mohrhard <[email protected]> Date: Sat Jan 4 13:04:19 2014 +0100 todo has been implemented Change-Id: Ibf99ebef1583618b2108be41dc6535c574391f20 diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 1f86264..efc5333 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -1101,7 +1101,6 @@ double VDataSeries::getValueByProperty( sal_Int32 nIndex, const OUString& rPropN return fNan; } - // TODO:moggi handle time based charting const VDataSequence* pData = itr->second; double fValue = pData->getValue(nIndex); if(mpOldSeries && mpOldSeries->hasPropertyMapping(rPropName)) commit 2a43b9b85b86cd3b6e36596c62fae6f6a1b50b32 Author: Markus Mohrhard <[email protected]> Date: Sat Jan 4 13:03:40 2014 +0100 add property mapping to pie charts Change-Id: Ic65061fcb320ba2b249d53396bce9ccd2049474c diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 1e7c1af..c5fdcc2 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -347,6 +347,8 @@ void PieChart::createShapes() if(!pSeries) continue; + bool bHasFillColorMapping = pSeries->hasPropertyMapping("FillColor"); + m_pPosHelper->m_fAngleDegreeOffset = pSeries->getStartingAngle(); double fLogicYSum = 0.0; @@ -432,6 +434,13 @@ void PieChart::createShapes() , fUnitCircleInnerRadius, fUnitCircleOuterRadius , fLogicZ, fDepth, fExplodePercentage, apOverwritePropertiesMap.get() ) ); + if(bHasFillColorMapping) + { + uno::Reference< beans::XPropertySet > xProps( xPointShape, uno::UNO_QUERY_THROW ); + xProps->setPropertyValue("FillColor", uno::makeAny(static_cast<sal_Int32>( + pSeries->getValueByProperty(nPointIndex, "FillColor")))); + } + //create label if( pSeries->getDataPointLabelIfLabel(nPointIndex) ) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
