summaryrefslogtreecommitdiff
authorMuthu Subramanian <sumuthu@suse.com>2011-11-02 08:20:20 (GMT)
committer Lionel Elie Mamane <lionel@mamane.lu>2011-11-28 09:19:28 (GMT)
commit5c613fa40a60cbd2c2664783a0aaebee6dfc4309 (patch) (side-by-side diff)
tree02d7d8fbf1e1a6c4f21bef47d33c15fecdf38085
parent14e76658d05343eaf8c7d9dd20402ee267cbd957 (diff)
downloadfilters-5c613fa40a60cbd2c2664783a0aaebee6dfc4309.zip
filters-5c613fa40a60cbd2c2664783a0aaebee6dfc4309.tar.gz
n#706792: Fix crash while opening certain pptx files.
Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--oox/source/drawingml/chart/seriesconverter.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 2a2564f..454496f 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -196,7 +196,7 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat
PropertySet aPropSet( rxDataSeries->getDataPointByIndex( mrModel.mnIndex ) );
lclConvertLabelFormatting( aPropSet, getFormatter(), mrModel, rTypeGroup, false );
- if( !mrModel.mxLayout->mbAutoLayout )
+ if( mrModel.mxLayout && !mrModel.mxLayout->mbAutoLayout )
{
// bnc#694340 - nasty hack - chart2 cannot individually
// place data labels, let's try to find a useful