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

Caolán McNamara caolanm at redhat.com
Fri Apr 17 00:59:41 PDT 2015


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

New commits:
commit 6beaa148f59e22610fb38db1f1e628963789d5d7
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/15322
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 3dc8602..5ad9f35 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1943,7 +1943,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 ),
@@ -1986,7 +1986,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 ),


More information about the Libreoffice-commits mailing list