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

fpspreadsheet: Extend ooxml reader to read formulas and their result.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3380 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-07-25 21:05:35 +00:00
parent 11772b0156
commit 9f7237554d
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -575,6 +575,7 @@ type
procedure WriteErrorValue(ARow, ACol: Cardinal; AValue: TsErrorValue); overload; procedure WriteErrorValue(ARow, ACol: Cardinal; AValue: TsErrorValue); overload;
procedure WriteErrorValue(ACell: PCell; AValue: TsErrorValue); overload; procedure WriteErrorValue(ACell: PCell; AValue: TsErrorValue); overload;
procedure WriteFormula(ARow, ACol: Cardinal; AFormula: TsFormula); procedure WriteFormula(ARow, ACol: Cardinal; AFormula: TsFormula);
procedure WriteNumber(ARow, ACol: Cardinal; ANumber: double); overload; procedure WriteNumber(ARow, ACol: Cardinal; ANumber: double); overload;

37
components/fpspreadsheet/xlsxooxml.pas
View File

@ -419,6 +419,10 @@ begin
datanode := datanode.NextSibling; datanode := datanode.NextSibling;
end; end;
// formula to cell
if formulaStr <> '' then
cell^.FormulaValue.FormulaStr := '=' + formulaStr;
// get data type // get data type
s := GetAttrValue(cellnode, 't'); // data type s := GetAttrValue(cellnode, 't'); // data type
if s = 'n' then if s = 'n' then
@ -427,10 +431,37 @@ begin
if s = 's' then begin if s = 's' then begin
sstIndex := StrToInt(dataStr); sstIndex := StrToInt(dataStr);
ASheet.WriteUTF8Text(cell, FSharedStrings[sstIndex]); ASheet.WriteUTF8Text(cell, FSharedStrings[sstIndex]);
end end else
if s = 'str' then
ASheet.WriteUTF8Text(cell, datastr)
else else
if s = '' then if s = 'b' then
ASheet.WriteBlank(cell); ASheet.WriteBoolValue(cell, dataStr='1')
else
if s = 'e' then begin
if dataStr = '#NULL!' then
ASheet.WriteErrorValue(cell, errEmptyIntersection)
else if dataStr = '#DIV/0!' then
ASheet.WriteErrorValue(cell, errDivideByZero)
else if dataStr = '#VALUE!' then
ASheet.WriteErrorValue(cell, errWrongType)
else if dataStr = '#REF!' then
ASheet.WriteErrorValue(cell, errIllegalRef)
else if dataStr = '#NAME?' then
ASheet.WriteErrorValue(cell, errWrongName)
else if dataStr = '#NUM!' then
ASheet.WriteErrorValue(cell, errOverflow)
else if dataStr = '#N/A' then
ASheet.WriteErrorValue(cell, errArgError)
else
raise Exception.Create('unknown error type');
end else
if s = '' then begin
if formulaStr = '' then
ASheet.WriteBlank(cell)
else
ASheet.WriteNumber(cell, STrToFloat(dataStr, FPointSeparatorSettings));
end;
end; end;
cellnode := cellnode.NextSibling; cellnode := cellnode.NextSibling;