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

fpspreadsheet: Fix reading of shared formulas in xls BIFF5 and BIFF8 (no shared formulas in BIFF2)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6459 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-06-04 19:05:07 +00:00
parent f3ae814cc5
commit 8ee5fe1200
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/fpspreadsheet/source/common/xlscommon.pas
View File

@ -2872,13 +2872,16 @@ var
n: Word; n: Word;
rpnFormula: TsRPNformula; rpnFormula: TsRPNformula;
formula: PsFormula; formula: PsFormula;
isPartOfSharedFormula: Boolean;
begin begin
n := ReadRPNTokenArraySize(AStream); n := ReadRPNTokenArraySize(AStream);
if n = 0 then if n = 0 then
exit(false); exit(false);
Result := ReadRPNTokenArray(AStream, n, rpnFormula, ACell, ASharedFormulaBase); Result := ReadRPNTokenArray(AStream, n, rpnFormula, ACell, ASharedFormulaBase);
if Result then begin isPartOfSharedFormula := Length(rpnFormula) = 0; // Shared formula parts are handled separately
if Result and not isPartOfSharedFormula then begin
formula := TsWorksheet(FWorksheet).Formulas.FindFormula(ACell); formula := TsWorksheet(FWorksheet).Formulas.FindFormula(ACell);
if formula = nil then begin if formula = nil then begin
formula := TsWorksheet(FWorksheet).Formulas.AddFormula(ACell^.Row, ACell^.Col); formula := TsWorksheet(FWorksheet).Formulas.AddFormula(ACell^.Row, ACell^.Col);
@ -2886,10 +2889,13 @@ begin
end; end;
formula^.Parser.RPNFormula := rpnFormula; formula^.Parser.RPNFormula := rpnFormula;
formula^.Text := formula^.Parser.Expression; formula^.Text := formula^.Parser.Expression;
TsWorksheet(FWorksheet).UseFormulaInCell(ACell, formula);
{
if formula^.Parser.Has3dLinks then if formula^.Parser.Has3dLinks then
ACell^.Flags := ACell^.Flags + [cfHasFormula, cf3dFormula] ACell^.Flags := ACell^.Flags + [cfHasFormula, cf3dFormula]
else else
ACell^.Flags := ACell^.Flags + [cfHasFormula]; ACell^.Flags := ACell^.Flags + [cfHasFormula];
}
{ {
strFormula := tsWorksheet(FWorksheet).ConvertRPNFormulaToStringFormula(rpnFormula); strFormula := tsWorksheet(FWorksheet).ConvertRPNFormulaToStringFormula(rpnFormula);
if strFormula <> '' then begin if strFormula <> '' then begin
@ -3217,6 +3223,7 @@ begin
// Copy shared formula to individual cells in the specified range // Copy shared formula to individual cells in the specified range
for r := r1 to r2 do for r := r1 to r2 do
for c := c1 to c2 do for c := c1 to c2 do
if (r <> cell^.Row) or (c <> cell^.Col) then
TsWorksheet(FWorksheet).CopyFormula(cell, r, c); TsWorksheet(FWorksheet).CopyFormula(cell, r, c);
end; end;