From 9e06abcd17e3b236d6f0d1c48601dfaf36283cc8 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 14 May 2017 21:41:40 +0000 Subject: [PATCH] fpspreadsheet: Fix incorrect grid column count if aeDefault is not in AutoExpand flags (http://forum.lazarus.freepascal.org/index.php/topic,36770.msg246192.html#msg246192). git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5857 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../source/visual/fpspreadsheetgrid.pas | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas index 1e02c8175..dedaa46b1 100644 --- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas +++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas @@ -5115,11 +5115,18 @@ begin end else if Worksheet <> nil then begin if aeDefault in FAutoExpand then begin - ColCount := Max(GetGridCol(Worksheet.GetLastColIndex)+1, DEFAULT_COL_COUNT) + FHeaderCount; - RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex)+1, DEFAULT_ROW_COUNT) + FHeaderCount; + ColCount := Max(GetGridCol(Worksheet.GetLastColIndex)+1, DEFAULT_COL_COUNT); // + FHeaderCount; + RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex)+1, DEFAULT_ROW_COUNT); // + FHeaderCount; end else begin - ColCount := Max(GetGridCol(WorkSheet.GetLastColIndex), 1) + FHeaderCount; - RowCount := Max(GetGridCol(Worksheet.GetLastRowIndex), 1) + FHeaderCount; + +// wp: next lines replaced by the following ones because of +// http://forum.lazarus.freepascal.org/index.php/topic,36770.msg246192.html#msg246192 +// NOTE: VERY SENSITIVE LOCATION !!! + +// ColCount := Max(GetGridCol(WorkSheet.GetLastColIndex), 1) + FHeaderCount; +// RowCount := Max(GetGridCol(Worksheet.GetLastRowIndex), 1) + FHeaderCount; + ColCount := Max(GetGridCol(WorkSheet.GetLastColIndex)+1, 1); // + FHeaderCount; + RowCount := Max(GetGridCol(Worksheet.GetLastRowIndex)+1, 1); // + FHeaderCount; end; FixedCols := FFrozenCols + FHeaderCount; FixedRows := FFrozenRows + FHeaderCount;