[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

[Kohei Yoshida]

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

New commits:
commit 7ba14f3fa86d1a5fbb04ca35dcb2fd1439a4223e
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Jul 1 15:10:19 2014 -0400

    bnc#812796: Don't create data series when the series has no values.
    
    Change-Id: I92e2d7a3fab0948aea0557cf3cb65d57d48f3f59
    (cherry picked from commit 5e2b7e37a29edf45f829ccee2302a942b54568a1)
    Reviewed-on: https://gerrit.libreoffice.org/10039
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 292e8a4..bc27b35 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -544,6 +544,10 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve
             Reference< XDataSequence > xValues = xYValueSeq->getValues();
             if( xValues.is() )
                 nDataPointCount = xValues->getData().getLength();
+
+            if (!nDataPointCount)
+                // No values present.  Don't create a data series.
+                return Reference<XDataSeries>();
         }
         // add X values of scatter and bubble charts
         if( !rTypeInfo.mbCategoryAxis )