From 4a1bea77f748c5e189e7e45554ece7dc0cd749ac Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 25 Sep 2016 21:36:52 +0000
Subject: [PATCH] fpspreadsheet: Add new grid method
 LoadSheetFromSpreadsheetFile (in order to be able to read a specific sheet
 without having to specify the file format id).

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

diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 3630fe2da..f88dfb48b 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -277,7 +277,8 @@ type
     procedure AutoRowHeight(ARow: Integer);
     function CellRect(ACol1, ARow1, ACol2, ARow2: Integer): TRect; overload;
     procedure Clear;
-    procedure DefaultDrawCell(ACol, ARow: Integer; var ARect: TRect; AState: TGridDrawState); override;
+    procedure DefaultDrawCell(ACol, ARow: Integer; var ARect: TRect;
+      AState: TGridDrawState); override;
     procedure DeleteCol(AGridCol: Integer); reintroduce;
     procedure DeleteRow(AGridRow: Integer); reintroduce;
     procedure EditingDone; override;
@@ -292,12 +293,9 @@ type
     procedure LoadFromSpreadsheetFile(AFileName: string;
       AFormat: TsSpreadsheetFormat; AWorksheetIndex: Integer = -1); overload;
     procedure LoadFromSpreadsheetFile(AFileName: string;
-      AFormatID: TsSpreadFormatID = sfidUnknown;
-      AWorksheetIndex: Integer = -1); overload;
-    {
-    procedure LoadFromSpreadsheetFile(AFileName: string;
-      AWorksheetIndex: Integer = -1); overload;
-      }
+      AFormatID: TsSpreadFormatID = sfidUnknown; AWorksheetIndex: Integer = -1); overload;
+    procedure LoadSheetFromSpreadsheetFile(AFileName: String;
+      AWorksheetIndex: Integer = -1; AFormatID: TsSpreadFormatID = sfidUnknown);
     procedure LoadFromWorkbook(AWorkbook: TsWorkbook; AWorksheetIndex: Integer = -1);
     procedure NewWorkbook(AColCount, ARowCount: Integer);
     procedure SaveToSpreadsheetFile(AFileName: string;
@@ -3913,8 +3911,8 @@ end;
   Call this method for both built-in and user-provided file formats.
 
   @param   AFileName        Name of the file to be loaded
-  @param   AFormatID        Spreadsheet file format identifier assumed for the file
-                            (automatic detection if empty)
+  @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)
 -------------------------------------------------------------------------------}
@@ -3923,20 +3921,22 @@ procedure TsCustomWorksheetGrid.LoadFromSpreadsheetFile(AFileName: string;
 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.
+  Creates a new workbook and loads the given file into it. Shows the sheet
+  with the specified sheet index. The file format is determined automatically.
 
   @param   AFileName        Name of the file to be loaded
   @param   AWorksheetIndex  Index of the worksheet to be shown in the grid
                             (If empty then the active worksheet is loaded)
+  @param   AFormatID        Spreadsheet file format identifier assumed for the
+                            file (automatic detection if empty)
 -------------------------------------------------------------------------------}
-procedure TsCustomWorksheetGrid.LoadFromSpreadsheetFile(AFileName: string;
-  AWorksheetIndex: Integer);
+procedure TsCustomWorksheetGrid.LoadSheetFromSpreadsheetFile(AFileName: String;
+  AWorksheetIndex: Integer = -1; AFormatID: TsSpreadFormatID = sfidUnknown);
 begin
-  GetWorkbookSource.LoadFromSpreadsheetFile(AFileName, AWorksheetIndex);
-end;                                                        *)
+  GetWorkbookSource.LoadFromSpreadsheetFile(AFilename, AFormatID, AWorksheetIndex);
+end;
 
 {@@ ----------------------------------------------------------------------------
   Loads an existing workbook into the grid.