[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xichart.cxx      |    2 +-
 sc/source/filter/oox/defnamesbuffer.cxx |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f204cd9b52ec7af3e0d20f5c88f09737b38b9e7d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Jan 3 00:27:08 2013 -0500

    fdo#58539: Check for mxValueLink being NULL before dereferencing.
    
    Or else Calc would crash while loading the xls document from
    gnome519788.
    
    As an aside, this xls document appears to be corrupt. Trying to
    open it in Excel (XP and 2007) causes Excel to offer to repair it,
    while fails in both versions.  Excel XP is somehow able to open it
    with some content preserved. No such luck with Excel 2007.
    
    Change-Id: I04616a4c926862461a2efdd99ccabe36122d6825

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 1aa9d45..8310deb 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2057,7 +2057,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
         aSeriesProp.SetBoolProperty( EXC_CHPROP_VARYCOLORSBY, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE );
 #endif
         // #i91271# always set area formatting for every point in pie/doughnut charts
-        if( mxSeriesFmt && ((bVarPointFmt && mxSeriesFmt->IsAutoArea()) || (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE)) )
+        if (mxSeriesFmt && mxValueLink && ((bVarPointFmt && mxSeriesFmt->IsAutoArea()) || (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE)))
         {
             for( sal_uInt16 nPointIdx = 0, nPointCount = mxValueLink->GetCellCount(); nPointIdx < nPointCount; ++nPointIdx )
             {
commit eee87edf551f7a9f8c4da4267e5710edafd1725d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Jan 2 23:56:43 2013 -0500

    fdo#58539: Properly initialize a member pointer value.
    
    Or else it would crash when loading the doc from fdo#55174.
    
    Change-Id: I21eb77f97dcab467c185dacaf9f00753bb4fc18c

diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index d735ac4..488b7e3 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -285,6 +285,7 @@ ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffI
 
 DefinedName::DefinedName( const WorkbookHelper& rHelper ) :
     DefinedNameBase( rHelper ),
+    mpScRangeData(NULL),
     mnTokenIndex( -1 ),
     mcBuiltinId( BIFF_DEFNAME_UNKNOWN ),
     mnFmlaSize( 0 )