From 74f61771c9229cf22582e22405dde6b05496e739 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 11 Sep 2018 21:24:51 +0000
Subject: [PATCH] fpspreadsheet: Fix reading of repeated columns from ODS files
 (introduced by r6636).

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6645 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/source/common/fpsopendocument.pas       | 8 ++------
 components/fpspreadsheet/tests/formulatests.pas           | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/components/fpspreadsheet/source/common/fpsopendocument.pas b/components/fpspreadsheet/source/common/fpsopendocument.pas
index 44d52fbdf..43457c4ac 100644
--- a/components/fpspreadsheet/source/common/fpsopendocument.pas
+++ b/components/fpspreadsheet/source/common/fpsopendocument.pas
@@ -1119,11 +1119,7 @@ begin
   begin
     colData := TColumnData(FColumnList[i]);
     colIndex := colData.Col;
-                     (*
-    writeLn('FColumnList[',i,']:');
-    WriteLn('  colIndex', colData.Col);
-    WriteLn('  hidden: ', colData.Hidden);
-                       *)
+
     // Skip column records beyond the last data column - there's a bug in OO/LO
     // which adds column records up to the max column limit.
     if colIndex > lastOccCol then
@@ -1961,7 +1957,7 @@ var
         colsRepeated := StrToInt(s);
       inc(col);
       if (defCellStyleIndex > -1) or isHidden then begin
-        for j := 0 to colsRepeated-1 do
+        for j := 1 to colsRepeated-1 do           // was: j := 0 to ...
         begin
           coldata := TColumnData.Create;
           colData.Col := col + j;
diff --git a/components/fpspreadsheet/tests/formulatests.pas b/components/fpspreadsheet/tests/formulatests.pas
index 2bfae4f75..35947851a 100644
--- a/components/fpspreadsheet/tests/formulatests.pas
+++ b/components/fpspreadsheet/tests/formulatests.pas
@@ -961,7 +961,7 @@ begin
     end;
   finally
     book.Free;
-    deleteFile(tempFile);
+    DeleteFile(tempFile);
   end;
 end;