pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix reading of shared formulas in xls files (bug introduced by the new calculation engine).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6584 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-08-10 11:47:33 +00:00
parent 6ec13372aa
commit 1a0404f2ee
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/fpspreadsheet/source/common/xlscommon.pas
View File

@ -1887,6 +1887,10 @@ begin
// Don't call "AddCell" because, if the cell belongs to a shared formula, it // Don't call "AddCell" because, if the cell belongs to a shared formula, it
// already has been created before, and then would exist in the tree twice. // already has been created before, and then would exist in the tree twice.
// Prevent shared formulas (which already may have been written at this time)
// being erased when cell content is written
TsWorkbook(sheet.Workbook).LockFormulas;
try
// Now determine the type of the formula result // Now determine the type of the formula result
if (Data[6] = $FF) and (Data[7] = $FF) then if (Data[6] = $FF) and (Data[7] = $FF) then
case Data[0] of case Data[0] of
@ -1915,6 +1919,9 @@ begin
else else
sheet.WriteNumber(cell, ResultFormula); sheet.WriteNumber(cell, ResultFormula);
end; end;
finally
TsWorkbook(sheet.Workbook).UnlockFormulas;
end;
{ Formula token array } { Formula token array }
if boReadFormulas in FWorkbook.Options then if boReadFormulas in FWorkbook.Options then