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

fpspreadsheet: Fix writing of RC formulas for Excel2003/XML format.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7037 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-07-15 11:03:34 +00:00
parent 8ff3813be2
commit 8f706c4a8c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr
View File

@@ -144,7 +144,6 @@ begin
MyWorksheet.WriteFont(8, 3, 'Courier New', 12, [fssUnderline], scBlue); MyWorksheet.WriteFont(8, 3, 'Courier New', 12, [fssUnderline], scBlue);
MyWorksheet.WriteBackgroundColor(8, 3, scYellow); MyWorksheet.WriteBackgroundColor(8, 3, scYellow);
(********************* to do...
MyWorksheet.WriteComment(8, 3, 'This is font "Courier New", Size 12.'); MyWorksheet.WriteComment(8, 3, 'This is font "Courier New", Size 12.');
// Write the string formula E1 = A1 + B1 ... // Write the string formula E1 = A1 + B1 ...
@@ -172,7 +171,7 @@ begin
RPNSTring('B', RPNSTring('B',
RPNFunc(fekConcat, RPNFunc(fekConcat,
nil))))); nil)))));
*)
r := 10; r := 10;
MyWorksheet.WriteText(r, 0, 'Writing current date/time:'); MyWorksheet.WriteText(r, 0, 'Writing current date/time:');
inc(r, 2); inc(r, 2);

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

@@ -3036,14 +3036,18 @@ begin
if (ACell = nil) or (not HasFormula(ACell)) then if (ACell = nil) or (not HasFormula(ACell)) then
exit; exit;
formula := FFormulas.findFormula(ACell^.Row, ACell^.Col); formula := FFormulas.FindFormula(ACell^.Row, ACell^.Col);
oldDialect := formula^.Parser.Dialect; oldDialect := formula^.Parser.Dialect;
if oldDialect <> ADialect then begin
try try
formula^.Parser.Dialect := ADialect; formula^.Parser.Dialect := ADialect;
formula^.Parser.PrepareCopyMode(ACell, nil);
Result := formula^.Parser.Expression; Result := formula^.Parser.Expression;
finally finally
formula^.Parser.PrepareCopyMode(nil, nil);
formula^.Parser.Dialect := oldDialect; formula^.Parser.Dialect := oldDialect;
end; end;
end;
end; end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------