diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-07 03:43:47 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-06-07 05:07:10 +0200 |
| commit | bd096081eb56a70cd6f65e5c957fa73cd5193f1d (patch) | |
| tree | 45cbd3b43dda0af46f571c9dc98336c24cbd7f43 /oox/source/drawingml | |
| parent | 1ccbf70397adf07f1fe55f61c05ce1a741305cfc (diff) | |
make sure all objects exist, related fdo#75692
fdo75692-2.xlsx and fdo#75692-3.xlsx crash.
Change-Id: I56353e7da1850a49e18d3a570641843600d34b1c
Diffstat (limited to 'oox/source/drawingml')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 8c97b8781473..0737830ece35 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1249,7 +1249,8 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& { Reference< chart2::data::XDataReceiver > xDataRec( xChartDoc, UNO_QUERY ); Reference< chart2::data::XDataSource > xData( xDataRec->getUsedData(), UNO_QUERY ); - if( xData->getDataSequences().getLength() <= 0 || xData->getDataSequences()[0]->getValues()->getData().getLength() <= 0 ) + if( xData->getDataSequences().getLength() <= 0 || !xData->getDataSequences()[0]->getValues().is() || + xData->getDataSequences()[0]->getValues()->getData().getLength() <= 0 ) { rFilter.useInternalChartDataTable( true ); rFilter.getChartConverter()->convertFromModel( rFilter, aModel, xChartDoc, xExternalPage, mxShape->getPosition(), mxShape->getSize() ); |