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

fpspreadsheet: Fix another case of adding/deleting rows/columns, now within the cell range of a formula. Forum https://forum.lazarus.freepascal.org/index.php/topic,49005.msg354461.html#msg354461

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7343 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-03-26 17:09:25 +00:00
parent d4ce1f8c06
commit b8eb9fca8b
2 changed files with 236 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/fpspreadsheet/source/common/fpsclasses.pas
View File

@ -257,7 +257,7 @@ procedure FixDeletedCol(AExprNode: TsExprNode; AData1, AData2: Pointer;
var
colIndex: Cardinal;
referencedSheet, referencedSheet2: TsBasicWorksheet;
changedSheet: TsBasicWorksheet;
currentSheet, changedSheet: TsBasicWorksheet;
rng: TsCellRange;
begin
colIndex := PtrInt(AData1);
@ -285,6 +285,7 @@ begin
begin
if TsCellRangeExprNode(AExprNode).Error <> errOK then
exit;
currentSheet := TsCellRangeExprNode(AExprNode).Worksheet;
referencedSheet := TsCellRangeExprNode(AExprNode).GetSheet(1);
referencedSheet2 := TsCellRangeExprNode(AExprNode).GetSheet(2);
if TsCellRangeExprNode(AExprNode).Has3dLink and
@ -292,7 +293,7 @@ begin
(referencedSheet2 <> changedSheet)
then
exit;
if referencedSheet = nil then
if (referencedSheet = nil) and (currentSheet <> changedSheet) then
exit;
rng := TsCellRangeExprNode(AExprNode).Range;
if (rng.Col1 = colIndex) and (rng.Col2 = colIndex) then begin
@ -318,7 +319,7 @@ var
rowIndex: Cardinal;
rng: TsCellRange;
changedSheet: TsBasicWorksheet;
referencedSheet, referencedSheet2: TsBasicWorksheet;
currentSheet, referencedSheet, referencedSheet2: TsBasicWorksheet;
begin
rowIndex := PtrInt(AData1);
changedSheet := TsBasicWorksheet(AData2);
@ -346,6 +347,7 @@ begin
begin
if TsCellRangeExprNode(AExprNode).Error <> errOK then
exit;
currentSheet := TsCellRangeExprNode(AExprNode).WorkSheet;
referencedSheet := TsCellRangeExprNode(AExprNode).GetSheet(1);
referencedSheet2 := TsCellRangeExprNode(AExprNode).GetSheet(2);
if TsCellRangeExprNode(AExprNode).Has3dLink and
@ -354,7 +356,7 @@ begin
then
exit;
if (referencedSheet = nil) then
if (referencedSheet = nil) and (currentSheet <> changedSheet) then
exit;
rng := TsCellRangeExprNode(AExprNode).Range;
@ -380,7 +382,7 @@ procedure FixInsertedCol(AExprNode: TsExprNode; AData1, AData2: Pointer;
var MustRebuildFormulas: Boolean);
var
colIndex: Cardinal;
changedSheet: TsBasicWorksheet;
currentSheet, changedSheet: TsBasicWorksheet;
referencedSheet, referencedSheet2: TsBasicWorksheet;
rng: TsCellRange;
begin
@ -404,6 +406,7 @@ begin
begin
if TsCellRangeExprNode(AExprNode).Error <> errOK then
exit;
currentSheet := TsCellRangeExprNode(AExprNode).Worksheet;
referencedSheet := TsCellRangeExprNode(AExprNode).GetSheet(1);
referencedSheet2 := TsCellRangeExprNode(AExprNode).GetSheet(2);
if TsCellRangeExprNode(AExprNode).Has3dLink and
@ -411,7 +414,7 @@ begin
(referencedSheet2 <> changedSheet)
then
exit;
if referencedSheet = nil then
if (referencedSheet = nil) and (changedSheet <> currentSheet) then
exit;
rng := TsCellRangeExprNode(AExprNode).Range;
if rng.Col1 >= colIndex then begin
@ -430,7 +433,7 @@ procedure FixInsertedRow(AExprNode: TsExprNode; AData1, AData2: Pointer;
var MustRebuildFormulas: Boolean);
var
rowIndex: Cardinal;
changedSheet: TsBasicWorksheet;
currentSheet, changedSheet: TsBasicWorksheet;
referencedSheet, referencedSheet2: TsBasicWorksheet;
rng: TsCellRange;
begin
@ -454,6 +457,7 @@ begin
begin
if TsCellRangeExprNode(AExprNode).Error <> errOK then
exit;
currentSheet := TsCellRangeExprNode(AExprNode).Worksheet;
referencedSheet := TsCellRangeExprNode(AExprNode).GetSheet(1);
referencedSheet2 := TsCellRangeExprNode(AExprNode).GetSheet(2);
if TsCellRangeExprNode(AExprNode).Has3dLink and
@ -461,7 +465,7 @@ begin
(referencedSheet2 <> changedSheet)
then
exit;
if referencedSheet = nil then
if (referencedSheet = nil) and (currentSheet <> changedSheet) then
exit;
rng := TsCellRangeExprNode(AExprNode).Range;
if rng.Row1 >= rowIndex then begin

229
components/fpspreadsheet/tests/colrowtests.pas
View File

@ -56,6 +56,7 @@ type
procedure TestWriteRead_InsDelColRow(ATestIndex: Integer;
AFormat: TsSpreadsheetFormat);
procedure TestWriteRead_InsDelColRow_FormulaSameSheet(ATestIndex: Integer);
procedure TestWriteRead_InsDelColRow_FormulaOtherSheet(ATestIndex: Integer);
procedure TestWriteRead_HideShowColRow(IsCol: Boolean;
@ -343,10 +344,22 @@ type
procedure TestWriteRead_RemovePageBreak_Row_ODS;
procedure TestWriteRead_RemovePageBreak_RowHidden_ODS;
procedure TestWriteRead_InsCol_FormulaSameSheet;
procedure TestWriteRead_DelCol_FormulaSameSheet;
procedure TestWriteRead_InsRow_FormulaSameSheet;
procedure TestWriteRead_DelRow_FormulaSameSheet;
procedure TestWriteRead_InsCol_FormulaOtherSheet;
procedure TestWriteRead_InsRow_FormulaOtherSheet;
procedure TestWriteRead_DelCol_FormulaOtherSheet;
procedure TestWriteRead_InsRow_FormulaOtherSheet;
procedure TestWriteRead_DelRow_FormulaOtherSheet;
procedure TestWriteRead_InsCol_FormulaOtherSheet_Outside3D;
procedure TestWriteRead_DelCol_FormulaOtherSheet_Outside3D;
procedure TestWriteRead_InsRow_FormulaOtherSheet_Outside3D;
procedure TestWriteRead_DelRow_FormulaOtherSheet_Outside3D;
procedure TestWriteRead_InsCol_FormulaOtherSheet_Inside3D;
end;
implementation
@ -1877,6 +1890,88 @@ begin
end;
{------------------------------------------------------------------------------}
{ Insert/Delete columns/rows in same sheet of formula }
{------------------------------------------------------------------------------}
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsDelColRow_FormulaSameSheet(
ATestIndex: Integer);
var
workbook: TsWorkbook;
worksheet: TsWorksheet;
expected: Double;
actual: Double;
expectedformula: String;
actualFormula: String;
begin
workbook := TsWorkbook.Create;
try
workbook.Options := workbook.Options + [boAutoCalc];
worksheet := workbook.AddWorksheet('Sheet 1');
case ATestIndex of
0: begin // Insert a column in same sheet within range of formula
worksheet.WriteNumber(0, 0, 1.0);
worksheet.WriteNumber(0, 1, 2.0);
worksheet.WriteNumber(0, 2, 4.0);
worksheet.WriteFormula(0, 3, 'SUM(A1:C1)'); // formula in D1
expected := worksheet.ReadAsNumber(0, 3);
worksheet.InsertCol(1); // Insert a col into formula range --> formula moves to E1 and becomes SUM(A1:D1)
actual := worksheet.ReadAsNumber(0, 4);
CheckEquals(expected, actual, 'Test 0: Wrong formula result after inserting column into formula''s cell range.');
expectedformula := 'SUM(A1:D1)';
actualFormula := worksheet.ReadFormula(0, 4);
CheckEquals(expectedformula, actualFormula,
'Test 0: Wrong formula after inserting column into formula''s cell range.');
end;
1: begin // Delete a column from same sheet within range of formula
worksheet.WriteNumber(0, 0, 1.0);
worksheet.WriteNumber(0, 1, 2.0); // <--- to be delete --> result will be 1+5=5
worksheet.WriteNumber(0, 2, 4.0);
worksheet.WriteFormula(0, 3, 'SUM(A1:C1)'); // formula in D1
expected := 1.0 + 4.0;
worksheet.DeleteCol(1); // Delete a col from formula range --> formula moves to C1 and becomes SUM(A1:B1)
actual := worksheet.ReadAsNumber(0, 2);
CheckEquals(expected, actual, 'Test 1: Wrong formula result after deleting column from formula'' cell range');
expectedformula := 'SUM(A1:B1)';
actualFormula := worksheet.ReadFormula(0, 2);
CheckEquals(expectedformula, actualFormula,
'Test 1: Wrong formula after deleting column from formula''s cell range.');
end;
2: begin // Insert a row into same sheet within range of formula
worksheet.WriteNumber(0, 0, 1.0);
worksheet.WriteNumber(1, 0, 2.0);
worksheet.WriteNumber(2, 0, 4.0);
worksheet.WriteFormula(3, 0, 'SUM(A1:A3)'); // formula in A4
expected := worksheet.ReadAsNumber(3, 0);
worksheet.InsertRow(1); // Insert a row into formula's range --> formula moves to A5 and becomes SUM(A1:A4)
actual := worksheet.ReadAsNumber(4, 0);
CheckEquals(expected, actual, 'Test 2: Wrong formula result after inserting row into formula''s cell range');
expectedFormula := 'SUM(A1:A4)';
actualFormula := worksheet.ReadFormula(4, 0);
CheckEquals(expectedformula, actualFormula,
'Test 2: Wrong formula after inserting row into formula''s cell range.');
end;
3: begin // Delete a row from same sheet within range of formula
worksheet.WriteNumber(0, 0, 1.0);
worksheet.WriteNumber(1, 0, 2.0); // delet this row --> result will be 1+4
worksheet.WriteNumber(2, 0, 4.0);
worksheet.WriteFormula(3, 0, 'SUM(A1:A3)'); // formula in A4
expected := 1.0 + 4.0;
worksheet.DeleteRow(1); // Delete a row from formula's range --> formulamoves to A3 and becomes SUM(A1:A2)
actual := worksheet.ReadAsNumber(2, 0);
CheckEquals(expected, actual, 'Test 3: Deleting row from other sheet affects formula');
expectedformula := 'SUM(A1:A2)';
actualformula := worksheet.ReadFormula(2, 0);
CheckEquals(expectedformula, actualFormula,
'Test 3: Wrong formula after deleting row from formula''s cell range.');
end;
end;
finally
workbook.Free;
end;
end;
{------------------------------------------------------------------------------}
{ Insert/Delete columns/rows in other sheet of formula }
{------------------------------------------------------------------------------}
@ -1886,16 +1981,21 @@ var
workbook: TsWorkbook;
worksheet1: TsWorksheet;
worksheet2: TsWorksheet;
worksheet3: TsWorksheet;
expected: Double;
actual: Double;
expectedFormula: String;
actualFormula: String;
begin
workbook := TsWorkbook.Create;
try
workbook.Options := workbook.Options + [boAutoCalc];
worksheet1 := workbook.AddWorksheet('Sheet 1');
worksheet2 := workbook.AddWorksheet('Sheet 2');
worksheet1 := workbook.AddWorksheet('Sheet1');
worksheet2 := workbook.AddWorksheet('Sheet2');
worksheet3 := workbook.AddWorksheet('Sheet3');
case ATestIndex of
// 2D formulas
0: begin // Insert a column in unaffected sheet. Formula must be unchanged.
worksheet1.WriteNumber(0, 0, 1.0);
worksheet1.WriteNumber(0, 1, 2.0);
@ -1936,6 +2036,88 @@ begin
actual := worksheet1.ReadAsNumber(3, 0);
CheckEquals(expected, actual, 'Test 3: Deleting row from other sheet affects formula');
end;
// 3D formulas
4: begin // Insert a column in unaffected sheet. 3D-Formula must be unchanged.
worksheet1.WriteNumber(0, 0, 1.0);
worksheet1.WriteNumber(0, 1, 2.0);
worksheet1.WriteNumber(0, 2, 4.0);
worksheet2.WriteNumber(0, 0, 10.0);
worksheet2.WriteNumber(0, 1, 20.0);
worksheet2.WriteNumber(0, 2, 40.0);
worksheet1.WriteFormula(0, 3, 'SUM(Sheet1:Sheet2!A1:C1)');
expected := 1 + 2 + 4 + 10 + 20 + 40;
actual := worksheet1.ReadAsNumber(0, 3);
CheckEquals(expected, actual, 'Test 4: Wrong formula result');
worksheet3.InsertCol(1);
actual := worksheet1.ReadAsNumber(0, 3);
CheckEquals(expected, actual, 'Test 4: Inserting column in sheet outside 3D range affects formula');
end;
5: begin // Delete a column in unaffected sheet. 3D-Formula must be unchanged.
worksheet1.WriteNumber(0, 0, 1.0);
worksheet1.WriteNumber(0, 1, 2.0);
worksheet1.WriteNumber(0, 2, 4.0);
worksheet2.WriteNumber(0, 0, 10.0);
worksheet2.WriteNumber(0, 1, 20.0);
worksheet2.WriteNumber(0, 2, 40.0);
worksheet1.WriteFormula(0, 3, 'SUM(Sheet1:Sheet2!A1:C1)');
expected := 1 + 2 + 4 + 10 + 20 + 40;
actual := worksheet1.ReadAsNumber(0, 3);
CheckEquals(expected, actual, 'Test 5: Wrong formula result');
worksheet3.DeleteCol(1);
actual := worksheet1.ReadAsNumber(0, 3);
CheckEquals(expected, actual, 'Test 5: Deleting column from sheet outside 3D range affects formula');
end;
6: begin // Insert a row in unaffected sheet. 3D-Formula must be unchanged.
worksheet1.WriteNumber(0, 0, 1.0);
worksheet1.WriteNumber(1, 0, 2.0);
worksheet1.WriteNumber(2, 0, 4.0);
worksheet2.WriteNumber(0, 0, 10.0);
worksheet2.WriteNumber(1, 0, 20.0);
worksheet2.WriteNumber(2, 0, 40.0);
worksheet1.WriteFormula(3, 0, 'SUM(Sheet1:Sheet2!A1:A3)');
expected := 1 + 2 + 4 + 10 + 20 + 40;
actual := worksheet1.ReadAsNumber(3, 0);
CheckEquals(expected, actual, 'Test 6: Wrong formula result');
worksheet3.InsertRow(1);
actual := worksheet1.ReadAsNumber(3, 0);
CheckEquals(expected, actual, 'Test 6: Inserting row in sheet outside 3D range affects formula');
end;
7: begin // Delete a row from unaffected sheet. 3D-Formula must be unchanged.
worksheet1.WriteNumber(0, 0, 1.0);
worksheet1.WriteNumber(1, 0, 2.0);
worksheet1.WriteNumber(2, 0, 4.0);
worksheet2.WriteNumber(0, 0, 10.0);
worksheet2.WriteNumber(1, 0, 20.0);
worksheet2.WriteNumber(2, 0, 40.0);
worksheet1.WriteFormula(3, 0, 'SUM(Sheet1:Sheet2!A1:A3)');
expected := 1 + 2 + 4 + 10 + 20 + 40;
actual := worksheet1.ReadAsNumber(3, 0);
CheckEquals(expected, actual, 'Test 7: Wrong formula result');
worksheet3.DeleteRow(1);
actual := worksheet1.ReadAsNumber(3, 0);
CheckEquals(expected, actual, 'Test 7: Inserting row in sheet outside 3D range affects formula');
end;
8: begin
// Insert a column in unaffected sheet, but within 3d range of 3d formula.
// In Excel, the 3D formula is unchanged, but the location of the
// formula changes.
worksheet1.WriteNumber(0, 0, 1.0);
worksheet1.WriteNumber(0, 1, 2.0);
worksheet1.WriteNumber(0, 2, 4.0); // <-- insert column before this one.
worksheet2.WriteNumber(0, 0, 10.0);
worksheet2.WriteNumber(0, 1, 20.0);
worksheet2.WriteNumber(0, 2, 40.0);
worksheet1.WriteFormula(0, 3, 'SUM(Sheet1:Sheet2!A1:C1)'); // formula in C1
worksheet1.InsertCol(1);
expectedformula := 'SUM(Sheet1:Sheet2!A1:C1)'; // unchanged
actualformula := worksheet1.ReadFormula(0, 4); // the formula is in E1 now
CheckEquals(expectedformula, actualformula, 'Test 8: Wrong formula for case "Insert column in sheet with formula in 3D block');
expected := 1 + 2 + 10 + 20 + 40; // the "4" is moved out of the formula range
actual := worksheet1.ReadAsNumber(0, 4);
CheckEquals(expected, actual, 'Test 8: Wrong formula for case "Insert column in sheet with formula in 3D block');
end;
end;
finally
workbook.Free;
@ -2681,15 +2863,32 @@ begin
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsCol_FormulaSameSheet;
begin
TestWriteRead_InsDelColRow_FormulaSameSheet(0);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_DelCol_FormulaSameSheet;
begin
TestWriteRead_InsDelColRow_FormulaSameSheet(1);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsRow_FormulaSameSheet;
begin
TestWriteRead_InsDelColRow_FormulaSameSheet(2);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_DelRow_FormulaSameSheet;
begin
TestWriteRead_InsDelColRow_FormulaSameSheet(3);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsCol_FormulaOtherSheet;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(0);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsRow_FormulaOtherSheet;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_DelCol_FormulaOtherSheet;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(1);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_DelCol_FormulaOtherSheet;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsRow_FormulaOtherSheet;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(2);
end;
@ -2697,6 +2896,26 @@ procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_DelRow_FormulaOtherSheet;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(3);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsCol_FormulaOtherSheet_Outside3D;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(4);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_DelCol_FormulaOtherSheet_Outside3D;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(5);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsRow_FormulaOtherSheet_Outside3D;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(6);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_DelRow_FormulaOtherSheet_Outside3D;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(7);
end;
procedure TSpreadWriteRead_ColRow_Tests.TestWriteRead_InsCol_FormulaOtherSheet_Inside3D;
begin
TestWriteRead_InsDelColRow_FormulaOtherSheet(8);
end;
initialization
RegisterTest(TSpreadWriteRead_ColRow_Tests);