valgrind: check return of convertDateTime before using fDate

lots of spew in VALGRIND=memcheck make CppunitTest_writerperfect_calc Change-Id: I8b95e95218beefe19e881c9d055323d0abec49c7

valgrind: check return of convertDateTime before using fDate
lots of spew in VALGRIND=memcheck make CppunitTest_writerperfect_calc Change-Id: I8b95e95218beefe19e881c9d055323d0abec49c7
3150ae30 · Caolán McNamara · 78bc1be4 · 3150ae30
Kaydet (Commit) 3150ae30 authored Kas 13, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

xmlcelli.cxx sc/source/filter/xml/xmlcelli.cxx +10 -8

No files found.
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -935,14 +935,16 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos)
    if( pNote )
    {
        double fDate;
-        rXMLImport.GetMM100UnitConverter().convertDateTime( fDate, mxAnnotationData->maCreateDate );
+        if (rXMLImport.GetMM100UnitConverter().convertDateTime(fDate, mxAnnotationData->maCreateDate))
-        SvNumberFormatter* pNumForm = pDoc->GetFormatTable();
+        {
-        sal_uInt32 nfIndex = pNumForm->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM );
+            SvNumberFormatter* pNumForm = pDoc->GetFormatTable();
-        OUString aDate;
+            sal_uInt32 nfIndex = pNumForm->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM );
-        Color* pColor = 0;
+            OUString aDate;
-        Color** ppColor = &pColor;
+            Color* pColor = 0;
-        pNumForm->GetOutputString( fDate, nfIndex, aDate, ppColor );
+            Color** ppColor = &pColor;
-        pNote->SetDate( aDate );
+            pNumForm->GetOutputString( fDate, nfIndex, aDate, ppColor );
+            pNote->SetDate( aDate );
+        }
        pNote->SetAuthor( mxAnnotationData->maAuthor );
    }