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

[Lionel Elie Mamane]

 oox/source/drawingml/chart/seriesconverter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c613fa40a60cbd2c2664783a0aaebee6dfc4309
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Wed Nov 2 13:50:20 2011 +0530

    n#706792: Fix crash while opening certain pptx files.
    
    Signed-off-by: Lionel Elie Mamane <lionel at mamane.lu>

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