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

fpspreadsheet: Make sure that formulas are erased when new cell values are written by WorksheetGrid.Cells into cells containing formulas.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4432 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-01-18 13:35:48 +00:00
parent 638b34c693
commit 96ceb0a296
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -4452,9 +4452,24 @@ begin
end else end else
fmt := nil; fmt := nil;
if VarIsNull(AValue) then if VarIsNull(AValue) then begin
Worksheet.WriteBlank(r, c) cell := Worksheet.WriteBlank(r, c);
else if cell <> nil then cell^.FormulaValue := '';
end else
if VarIsStr(AValue) then
begin
s := VarToStr(AValue);
if s[1] = '=' then
begin
Worksheet.WriteFormula(r, c, Copy(s, 2, Length(s)), true);
exit;
end;
Worksheet.WriteCellValueAsString(r, c, s);
cell^.FormulaValue := '';
end else
begin
if cell <> nil then
cell^.FormulaValue := '';
if VarIsType(AValue, varDate) then if VarIsType(AValue, varDate) then
Worksheet.WriteDateTime(r, c, VarToDateTime(AValue)) Worksheet.WriteDateTime(r, c, VarToDateTime(AValue))
else else
@ -4475,12 +4490,6 @@ begin
end else end else
if VarIsBool(AValue) then if VarIsBool(AValue) then
Worksheet.WriteBoolValue(r, c, AValue) Worksheet.WriteBoolValue(r, c, AValue)
else
if VarIsStr(AValue) then begin
s := VarToStr(AValue);
if (s[1] = '=') then
Worksheet.WriteFormula(r, c, Copy(s, 2, Length(s)), true) else
Worksheet.WriteCellValueAsString(r, c, s);
end; end;
end; end;