From ec13cdb9298b61adb3411fca6912cf31b7eba755 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 24 Sep 2016 18:31:03 +0000 Subject: [PATCH] fpspreadsheet: Fix compilation of spreadsheet tests git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5206 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/tests/spreadtestgui.lpi | 3 --- components/fpspreadsheet/tests/virtualmodetests.pas | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpi b/components/fpspreadsheet/tests/spreadtestgui.lpi index 64a77e915..14a5c9ebc 100644 --- a/components/fpspreadsheet/tests/spreadtestgui.lpi +++ b/components/fpspreadsheet/tests/spreadtestgui.lpi @@ -12,9 +12,6 @@ - - - diff --git a/components/fpspreadsheet/tests/virtualmodetests.pas b/components/fpspreadsheet/tests/virtualmodetests.pas index 939954555..b07e53c9f 100644 --- a/components/fpspreadsheet/tests/virtualmodetests.pas +++ b/components/fpspreadsheet/tests/virtualmodetests.pas @@ -17,7 +17,7 @@ type TSpreadVirtualModeTests= class(TTestCase) private - procedure WriteVirtualCellDataHandler(Sender: TObject; ARow, ACol: Cardinal; + procedure WriteVirtualCellDataHandler(Sender: TsWorksheet; ARow, ACol: Cardinal; var AValue:Variant; var AStyleCell: PCell); protected // Set up expected values: @@ -56,7 +56,7 @@ procedure TSpreadVirtualModeTests.TearDown; begin end; -procedure TSpreadVirtualModeTests.WriteVirtualCellDataHandler(Sender: TObject; +procedure TSpreadVirtualModeTests.WriteVirtualCellDataHandler(Sender: TsWorksheet; ARow, ACol: Cardinal; var AValue:Variant; var AStyleCell: PCell); begin Unused(ACol); @@ -86,10 +86,10 @@ begin workbook.Options := workbook.Options + [boVirtualMode]; if ABufStreamMode then workbook.Options := workbook.Options + [boBufStream]; - workbook.VirtualColCount := 1; - workbook.VirtualRowCount := Length(SollNumbers) + 4; + worksheet.VirtualColCount := 1; + worksheet.VirtualRowCount := Length(SollNumbers) + 4; // We'll use only the first 4 SollStrings, the others cause trouble due to utf8 and formatting. - workbook.OnWriteCellData := @WriteVirtualCellDataHandler; + worksheet.OnWriteCellData := @WriteVirtualCellDataHandler; tempFile:=NewTempFile; workbook.WriteToFile(tempfile, AFormat, true); finally