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

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).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5857 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-05-14 21:41:40 +00:00
parent bea0ea9d36
commit 9e06abcd17
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@@ -5115,11 +5115,18 @@ begin
end else end else
if Worksheet <> nil then begin if Worksheet <> nil then begin
if aeDefault in FAutoExpand then begin if aeDefault in FAutoExpand then begin
ColCount := Max(GetGridCol(Worksheet.GetLastColIndex)+1, DEFAULT_COL_COUNT) + FHeaderCount; ColCount := Max(GetGridCol(Worksheet.GetLastColIndex)+1, DEFAULT_COL_COUNT); // + FHeaderCount;
RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex)+1, DEFAULT_ROW_COUNT) + FHeaderCount; RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex)+1, DEFAULT_ROW_COUNT); // + FHeaderCount;
end else begin 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; end;
FixedCols := FFrozenCols + FHeaderCount; FixedCols := FFrozenCols + FHeaderCount;
FixedRows := FFrozenRows + FHeaderCount; FixedRows := FFrozenRows + FHeaderCount;