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

fpspreadsheet: Remove cell content type cctFormula, it is a left-over from old formula engine. It causes incorrect reading of precalculated content in the first shared formula cell of BIFF. Tests still ok. (https://forum.lazarus.freepascal.org/index.php/topic,52811.0.html).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7962 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2021-01-09 18:54:11 +00:00
parent d685d0918c
commit 6a50fa2a4a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/fpspreadsheet/source/common/fpspreadsheet.pas
View File

@ -3164,7 +3164,7 @@ begin
AFormula^.Col := ACell^.Col;
AFormula^.Row := ACell^.Row;
ACell^.ContentType := cctFormula;
// ACell^.ContentType := cctFormula;
ACell^.Flags := ACell^.Flags + [cfHasFormula];
if (AFormula^.Parser <> nil) and AFormula^.Parser.Has3DLinks then
@ -4857,7 +4857,7 @@ begin
end;
// Set formula flags in cell
ACell^.ContentType := cctFormula;
// ACell^.ContentType := cctFormula;
ACell^.Flags := ACell^.Flags + [cfHasFormula];
// Notify controls of changed cell
@ -4914,7 +4914,7 @@ begin
formula^.Parser.RPNFormula := ARPNFormula;
formula^.Text := formula^.Parser.Expression[fdExcelA1];
UseFormulaInCell(ACell, formula);
ACell^.ContentType := cctFormula;
// ACell^.ContentType := cctFormula;
ChangedCell(ACell^.Row, ACell^.Col);
end;

2
components/fpspreadsheet/source/common/fpstypes.pas
View File

@ -765,7 +765,7 @@ type
// FormulaValue: String; // Formula for calculation of cell content
case ContentType: TCellContentType of // variant part must be at the end
cctEmpty : (); // has no data at all
cctFormula : (); // FormulaValue is outside the variant record
// cctFormula : (); // FormulaValue is outside the variant record
cctNumber : (Numbervalue: Double);
cctUTF8String : (); // UTF8StringValue is outside the variant record
cctDateTime : (DateTimeValue: TDateTime);