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

[Caolán McNamara]

 oox/source/export/chartexport.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f4a379fd7af83348a04cb13d9685bcc863d42381
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 15 10:30:34 2015 +0100

    fix crash on export of fdo60365-2.ods to xlsx
    
    Change-Id: I1a281b096e4d1831bcf67ca03180afff043fbcfd
    (cherry picked from commit 135907f2061550624ee1859745d94eee01849070)
    Reviewed-on: https://gerrit.libreoffice.org/15321
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit b748d80a408e822c367e9b87fe2c7f50322c2219)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/15434
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 0929096..cdcd680 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1941,7 +1941,7 @@ void ChartExport::exportSeriesCategory( const Reference< chart2::data::XDataSequ
     pFS->startElement( FSNS( XML_c, XML_cat ),
             FSEND );
 
-    OUString aCellRange =  xValueSeq->getSourceRangeRepresentation();
+    OUString aCellRange = xValueSeq.is() ? xValueSeq->getSourceRangeRepresentation() : OUString();
     aCellRange = parseFormula( aCellRange );
     // TODO: need to handle XML_multiLvlStrRef according to aCellRange
     pFS->startElement( FSNS( XML_c, XML_strRef ),
@@ -1984,7 +1984,7 @@ void ChartExport::exportSeriesValues( const Reference< chart2::data::XDataSequen
     pFS->startElement( FSNS( XML_c, nValueType ),
             FSEND );
 
-    OUString aCellRange =  xValueSeq->getSourceRangeRepresentation();
+    OUString aCellRange = xValueSeq.is() ? xValueSeq->getSourceRangeRepresentation() : OUString();
     aCellRange = parseFormula( aCellRange );
     // TODO: need to handle XML_multiLvlStrRef according to aCellRange
     pFS->startElement( FSNS( XML_c, XML_numRef ),