From 78654994178ca6fc80ddba31b36c677ab7c5bd35 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 25 Sep 2016 20:26:02 +0000
Subject: [PATCH] fpspreadsheet: Remove an overloaded LoadFromSpreadsheetFile
 method of TsWorksheetGrid to make this method compile with all levels of
 optional parameters used.

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

diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index b88204c3f..03427186c 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -292,9 +292,12 @@ type
     procedure LoadFromSpreadsheetFile(AFileName: string;
       AFormat: TsSpreadsheetFormat; AWorksheetIndex: Integer = -1); overload;
     procedure LoadFromSpreadsheetFile(AFileName: string;
-      AFormatID: TsSpreadFormatID; AWorksheetIndex: Integer = -1); overload;
+      AFormatID: TsSpreadFormatID = sfidUnknown;
+      AWorksheetIndex: Integer = -1); overload;
+    {
     procedure LoadFromSpreadsheetFile(AFileName: string;
       AWorksheetIndex: Integer = -1); overload;
+      }
     procedure LoadFromWorkbook(AWorkbook: TsWorkbook; AWorksheetIndex: Integer = -1);
     procedure NewWorkbook(AColCount, ARowCount: Integer);
     procedure SaveToSpreadsheetFile(AFileName: string;
@@ -3913,15 +3916,16 @@ end;
 
   @param   AFileName        Name of the file to be loaded
   @param   AFormatID        Spreadsheet file format identifier assumed for the file
+                            (automatic detection if empty)
   @param   AWorksheetIndex  Index of the worksheet to be displayed in the grid
                             (If empty then the active worksheet is loaded)
 -------------------------------------------------------------------------------}
 procedure TsCustomWorksheetGrid.LoadFromSpreadsheetFile(AFileName: string;
-  AFormatID: TsSpreadFormatID; AWorksheetIndex: Integer);
+  AFormatID: TsSpreadFormatID = sfidUnknown; AWorksheetIndex: Integer = -1);
 begin
   GetWorkbookSource.LoadFromSpreadsheetFile(AFileName, AFormatID, AWorksheetIndex);
 end;
-
+                                                          (*
 {@@ ----------------------------------------------------------------------------
   Creates a new workbook and loads the given file into it. The file format
   is determined automatically. Shows the sheet with the given sheet index.
@@ -3934,7 +3938,7 @@ procedure TsCustomWorksheetGrid.LoadFromSpreadsheetFile(AFileName: string;
   AWorksheetIndex: Integer);
 begin
   GetWorkbookSource.LoadFromSpreadsheetFile(AFileName, AWorksheetIndex);
-end;
+end;                                                        *)
 
 {@@ ----------------------------------------------------------------------------
   Loads an existing workbook into the grid.