From b00e9fa332f7a55bbbff1d7109bb749a25b7c2c1 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 18 Feb 2017 19:01:22 +0000
Subject: [PATCH] fpspreadsheet: Suppress filler columns in xlsx files by
 reading the dimensions attribute.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5755 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/source/common/xlsxooxml.pas | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/components/fpspreadsheet/source/common/xlsxooxml.pas b/components/fpspreadsheet/source/common/xlsxooxml.pas
index 13e05e722..341fa8ba1 100644
--- a/components/fpspreadsheet/source/common/xlsxooxml.pas
+++ b/components/fpspreadsheet/source/common/xlsxooxml.pas
@@ -61,6 +61,7 @@ type
     FSharedFormulaBaseList: TFPList;
     FPalette: TsPalette;
     FThemeColors: array of TsColor;
+    FLastRow, FLastCol: Cardinal;
     FWrittenByFPS: Boolean;
     procedure ApplyCellFormatting(ACell: PCell; XfIndex: Integer);
     procedure ApplyHyperlinks(AWorksheet: TsWorksheet);
@@ -74,6 +75,7 @@ type
     procedure ReadComments(ANode: TDOMNode; AWorksheet: TsWorksheet);
     procedure ReadDateMode(ANode: TDOMNode);
     procedure ReadDefinedNames(ANode: TDOMNode);
+    procedure ReadDimension(ANode: TDOMNode; AWorksheet: TsWorksheet);
     procedure ReadFileVersion(ANode: TDOMNode);
     procedure ReadFills(ANode: TDOMNode);
     function ReadFont(ANode: TDOMNode): Integer;
@@ -1065,8 +1067,8 @@ begin
       end else
         lCol.FormatIndex := 0;
 
-      if (lCol.ColWidthType = cwtCustom) or(lCol.FormatIndex > 0) then
-        for col := col1 to col2 do
+      if (lCol.ColWidthType = cwtCustom) or (lCol.FormatIndex > 0) then
+        for col := col1 to Min(col2, FLastCol) do
           AWorksheet.WriteColInfo(col, lCol);
     end;
     colNode := colNode.NextSibling;
@@ -1221,6 +1223,23 @@ begin
   end;
 end;
 
+procedure TsSpreadOOXMLReader.ReadDimension(ANode: TDOMNode;
+  AWorksheet: TsWorksheet);
+var
+  ref: String;
+  r1, c1: Cardinal;
+begin
+  FLastRow := MaxInt;
+  FLastCol := MaxInt;
+
+  if ANode = nil then
+    exit;
+
+  ref := GetAttrValue(ANode, 'ref');
+  if ref <> '' then
+    ParseCellRangeString(ref, r1, c1, FLastRow, FLastCol);
+end;
+
 procedure TsSpreadOOXMLReader.ReadFileVersion(ANode: TDOMNode);
 begin
   FWrittenByFPS := GetAttrValue(ANode, 'appName') = 'fpspreadsheet';
@@ -2210,6 +2229,7 @@ begin
       FSharedFormulaBaseList.Clear;
 
       // Sheet data, formats, etc.
+      ReadDimension(Doc.DocumentElement.FindNode('dimension'), FWorksheet);
       ReadSheetViews(Doc.DocumentElement.FindNode('sheetViews'), FWorksheet);
       ReadSheetFormatPr(Doc.DocumentElement.FindNode('sheetFormatPr'), FWorksheet);
       ReadCols(Doc.DocumentElement.FindNode('cols'), FWorksheet);