diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-06 01:38:13 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 01:45:31 +0200 |
| commit | 3f50246f6af1d26353377ff5cb2cc5a381c7d426 (patch) | |
| tree | 89a0a3d0173864480931489f29b3857515d07d10 /oox | |
| parent | 08906623da9f8c0749f12276832c95d229d9436c (diff) | |
import data point symbol color
Change-Id: I27ebd67a535f8617a6f535414ee8426fae6614b9
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 5 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/typegroupconverter.cxx | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index b33aabe9e86a..0b2b20aa47d6 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -481,7 +481,8 @@ void DataPointConverter::convertFromModel( const Reference< XDataSeries >& rxDat // data point marker if( mrModel.monMarkerSymbol.differsFrom( rSeries.mnMarkerSymbol ) || mrModel.monMarkerSize.differsFrom( rSeries.mnMarkerSize ) ) - rTypeGroup.convertMarker( aPropSet, mrModel.monMarkerSymbol.get( rSeries.mnMarkerSymbol ), mrModel.monMarkerSize.get( rSeries.mnMarkerSize ) ); + rTypeGroup.convertMarker( aPropSet, mrModel.monMarkerSymbol.get( rSeries.mnMarkerSymbol ), + mrModel.monMarkerSize.get( rSeries.mnMarkerSize ), mrModel.mxMarkerProp ); // data point pie explosion if( mrModel.monExplosion.differsFrom( rSeries.mnExplosion ) ) @@ -578,7 +579,7 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve } // data point markers - rTypeGroup.convertMarker( aSeriesProp, mrModel.mnMarkerSymbol, mrModel.mnMarkerSize ); + rTypeGroup.convertMarker( aSeriesProp, mrModel.mnMarkerSymbol, mrModel.mnMarkerSize, mrModel.mxMarkerProp ); #if OOX_CHART_SMOOTHED_PER_SERIES // #i66858# smoothed series lines rTypeGroup.convertLineSmooth( aSeriesProp, mrModel.mbSmooth ); diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 78046507d24f..a57c2188c648 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -452,7 +452,8 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra } } -void TypeGroupConverter::convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSymbol, sal_Int32 nOoxSize ) const +void TypeGroupConverter::convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSymbol, sal_Int32 nOoxSize, + ModelRef< Shape > xShapeProps ) const { if( !isSeriesFrameFormat() ) { @@ -480,6 +481,9 @@ void TypeGroupConverter::convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSym sal_Int32 nSize = static_cast< sal_Int32 >( nOoxSize * (2540.0 / 72.0) + 0.5 ); aSymbol.Size.Width = aSymbol.Size.Height = nSize; + Color aFillColor = xShapeProps->getFillProperties().maFillColor; + aSymbol.FillColor = aFillColor.getColor(getFilter().getGraphicHelper()); + // set the property rPropSet.setProperty( PROP_Symbol, aSymbol ); } |