From 99d3c528f393f0d648551ae3d5dfdf8a28f16b73 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 8 Feb 2015 22:22:40 +0000
Subject: [PATCH] fpspreadsheet: Fix TsWorksheetGrid ignoring worksheet's
 DefaulColWidth

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3939 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/fpspreadsheetgrid.pas | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 21f887f20..a2481cbfd 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -3401,12 +3401,12 @@ begin
   end else
   if Worksheet <> nil then begin
     Convert_sFont_to_Font(Workbook.GetDefaultFont, Font);
+    Canvas.Font.Assign(Font);
     ColCount := Max(integer(Worksheet.GetLastColIndex) + 1 + FHeaderCount, FInitColCount);
     RowCount := Max(integer(Worksheet.GetLastRowIndex) + 1 + FHeaderCount, FInitRowCount);
     FixedCols := FFrozenCols + FHeaderCount;
     FixedRows := FFrozenRows + FHeaderCount;
     if ShowHeaders then begin
-      Canvas.Font.Assign(Font);
       ColWidths[0] := Canvas.TextWidth(' 999999 ');
       RowHeights[0] := DefaultRowHeight;
     end;
@@ -3600,6 +3600,8 @@ begin
       lCol := Worksheet.FindCol(i - FHeaderCount);
       if lCol <> nil then
         w := CalcColWidth(lCol^.Width)
+      else
+        w := CalcColWidth(Worksheet.DefaultColWidth);
     end;
     ColWidths[i] := w;
   end;