From 3633414c485b39a1eb824bae0dd2002976a4dc6e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 19 Nov 2018 00:13:36 +0100 Subject: tdf#104579, if no data point shape props are set take the series props MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia2c0d6b05385a0f3900e20ef807b869e4098654c Reviewed-on: https://gerrit.libreoffice.org/63541 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit afe5e1f8de0a25364c8c98b453cfe831330c4eed) Reviewed-on: https://gerrit.libreoffice.org/63544 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- oox/source/drawingml/chart/seriesconverter.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 7e35fc6f2628..0c98cd1bd48e 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -639,6 +639,10 @@ void DataPointConverter::convertFromModel( const Reference< XDataSeries >& rxDat else getFormatter().convertFrameFormatting( aPropSet, mrModel.mxShapeProp, rTypeGroup.getSeriesObjectType(), rSeries.mnIndex ); } + else if (rSeries.mxShapeProp.is()) + { + getFormatter().convertFrameFormatting( aPropSet, rSeries.mxShapeProp, rTypeGroup.getSeriesObjectType(), rSeries.mnIndex ); + } } catch( Exception& ) { -- cgit v1.2.3