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

fpspreadsheet: Fix worksheetgrid growing by 1 row/col if ShowHeaders is off (issue #0030269)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4757 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-15 12:28:19 +00:00
parent dd6e379ea2
commit de98ef21bf
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -4347,8 +4347,15 @@ begin
if Worksheet <> nil then begin if Worksheet <> nil then begin
Convert_sFont_to_Font(Workbook.GetDefaultFont, Font); Convert_sFont_to_Font(Workbook.GetDefaultFont, Font);
Canvas.Font.Assign(Font); Canvas.Font.Assign(Font);
ColCount := Max(GetGridCol(Worksheet.GetLastColIndex) + 1, ColCount); if FHeaderCount = 0 then
RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex) + 1, RowCount); begin
ColCount := Max(GetGridCol(Worksheet.GetLastColIndex), ColCount-1);
RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex), RowCount-1);
end else
begin
ColCount := Max(GetGridCol(Worksheet.GetLastColIndex) + 1, ColCount);
RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex) + 1, RowCount);
end;
FixedCols := FFrozenCols + FHeaderCount; FixedCols := FFrozenCols + FHeaderCount;
FixedRows := FFrozenRows + FHeaderCount; FixedRows := FFrozenRows + FHeaderCount;
if ShowHeaders then begin if ShowHeaders then begin