paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Add to error log when a file with unknown formula is read.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6821 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2019-02-27 20:47:33 +00:00
parent 17d4e8186a
commit a6e527d8c1
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5839,7 +5839,7 @@ end;
procedure TsWorksheet.WriteFormula(ACell: PCell; AFormula: string;
ALocalized: Boolean = false);
var
parser: TsExpressionParser;
parser: TsExpressionParser = nil;
formula: PsFormula;
begin
if ACell = nil then
@ -5852,6 +5852,7 @@ begin
end;
formula := FFormulas.AddFormula(ACell^.Row, ACell^.Col, AFormula);
// wp: Why is this created when boIgnoreFormulas is active?
if not (boIgnoreFormulas in Workbook.Options) then
begin
@ -5860,11 +5861,26 @@ begin
AFormula := Copy(AFormula, 2, Length(AFormula));
parser := TsSpreadsheetParser.Create(self);
if ALocalized then
parser.LocalizedExpression[Workbook.FormatSettings] := AFormula
else
parser.Expression := AFormula;
AFormula := parser.Expression;
try
if ALocalized then
parser.LocalizedExpression[Workbook.FormatSettings] := AFormula
else
parser.Expression := AFormula;
AFormula := parser.Expression;
except
on E:Exception do begin
if FWorkbook.FReadWriteFlag = rwfNormal then
raise
else begin
FWorkbook.AddErrorMsg('Formula error in cell "%s!%s": %s', [
FName, GetCellString(ACell^.Row, ACell^.Col), E.Message]
);
parser.Free;
FFormulas.DeleteFormula(ACell^.Row, ACell^.Col);
exit;
end;
end;
end;
if parser.Has3DLinks then
ACell.Flags := ACell.Flags + [cf3dFormula]