oox/source/drawingml/shape.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bd096081eb56a70cd6f65e5c957fa73cd5193f1d
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Sat Jun 7 03:43:47 2014 +0200
make sure all objects exist, related fdo#75692
fdo75692-2.xlsx and fdo#75692-3.xlsx crash.
Change-Id: I56353e7da1850a49e18d3a570641843600d34b1c
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8c97b87..0737830 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() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
