[Libreoffice-commits] core.git: sc/source

Markus Mohrhard markus.mohrhard at googlemail.com
Thu Nov 7 05:17:49 CET 2013


 sc/source/filter/excel/impop.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95df39e382920dcd8bf86cb88f02dd219acbfa6f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Nov 7 05:00:08 2013 +0100

    we need to use ScDocumentImport for all calls
    
    otherwise a reallocation of the cell vector will invalidate the
    iterators for the position hint
    
    e.g. fdo#35208-1.xls
    
    Change-Id: I26e473c968633eb6e9cc3ecb1c8060105f5f47aa

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 8db86c3..d9d89f2 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -320,7 +320,7 @@ void ImportExcel::ReadInteger()
         maStrm >> nValue;
 
         GetXFRangeBuffer().SetXF( aScPos, nXFIdx );
-        GetDoc().SetValue(aScPos, nValue);
+        GetDocImport().setNumericCell(aScPos, nValue);
     }
 }
 
@@ -392,7 +392,7 @@ void ImportExcel::ReadBoolErr()
         const ScTokenArray* pScTokArr = ErrorToFormula( nType, nValue, fValue );
         ScFormulaCell* pCell = pScTokArr ? new ScFormulaCell(pD, aScPos, *pScTokArr) : new ScFormulaCell(pD, aScPos);
         pCell->SetHybridDouble( fValue );
-        GetDoc().SetFormulaCell(aScPos, pCell);
+        GetDocImport().setFormulaCell(aScPos, pCell);
     }
 }
 


More information about the Libreoffice-commits mailing list