pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Remove an overloaded LoadFromSpreadsheetFile method of TsWorksheetGrid to make this method compile with all levels of optional parameters used.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5210 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-09-25 20:26:02 +00:00
parent b034ec0017
commit 7865499417
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

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