From de98ef21bf7867315747e7c366585e4d89517300 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 15 Jun 2016 12:28:19 +0000
Subject: [PATCH] fpspreadsheet: Fix worksheetgrid growing by 1 row/col if
 ShowHeaders is off (issue #0030269)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4757 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/fpspreadsheetgrid.pas | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 6d34b3ac1..a258cf40b 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -4347,8 +4347,15 @@ begin
   if Worksheet <> nil then begin
     Convert_sFont_to_Font(Workbook.GetDefaultFont, Font);
     Canvas.Font.Assign(Font);
-    ColCount := Max(GetGridCol(Worksheet.GetLastColIndex) + 1, ColCount);
-    RowCount := Max(GetGridRow(Worksheet.GetLastRowIndex) + 1, RowCount);
+    if FHeaderCount = 0 then
+    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;
     FixedRows := FFrozenRows + FHeaderCount;
     if ShowHeaders then begin