[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source

[Libreoffice Gerrit user]

 oox/source/drawingml/chart/seriesconverter.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3633414c485b39a1eb824bae0dd2002976a4dc6e
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Mon Nov 19 00:13:36 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 19 16:00:21 2018 +0100

    tdf#104579, if no data point shape props are set take the series props
    
    Change-Id: Ia2c0d6b05385a0f3900e20ef807b869e4098654c
    Reviewed-on: https://gerrit.libreoffice.org/63541
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit afe5e1f8de0a25364c8c98b453cfe831330c4eed)
    Reviewed-on: https://gerrit.libreoffice.org/63544
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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& )
     {