From 126fe87ad1c17175ae7cedbbdcc4c14019c55f37 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 3 Aug 2015 14:18:23 +0000
Subject: [PATCH] fpspreadsheet: Fix xlsx writing column widths

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4238 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/xlsxooxml.pas | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas
index 769ed9034..b862f6875 100755
--- a/components/fpspreadsheet/xlsxooxml.pas
+++ b/components/fpspreadsheet/xlsxooxml.pas
@@ -2419,9 +2419,12 @@ procedure TsSpreadOOXMLWriter.WriteCols(AStream: TStream; AWorksheet: TsWorkshee
 var
   col: PCol;
   c: Integer;
+  w: Single;
 begin
+  {
   if AWorksheet.Cols.Count = 0 then
     exit;
+  }
 
   AppendToStream(AStream,
     '<cols>');
@@ -2429,10 +2432,13 @@ begin
   for c:=0 to AWorksheet.GetLastColIndex do begin
     col := AWorksheet.FindCol(c);
     if col <> nil then
-      AppendToStream(AStream, Format(
-        '<col min="%d" max="%d" width="%g" customWidth="1" />',
-        [c+1, c+1, col^.Width], FPointSeparatorSettings)
-      );
+      w := col^.Width
+    else
+      w := AWorksheet.DefaultColWidth;
+    AppendToStream(AStream, Format(
+      '<col min="%d" max="%d" width="%g" customWidth="1" />',
+      [c+1, c+1, w], FPointSeparatorSettings)
+    );
   end;
 
   AppendToStream(AStream,