From 7ef55a84d97a290cdfdd4c2686a8f0c32cc482ce Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 2 Dec 2015 23:24:41 +0000 Subject: [PATCH] fpspreadsheet: Fix compilation of fpsspeedtest. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4399 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../examples/fpsspeedtest/mainform.pas | 2 +- components/fpspreadsheet/fpsutils.pas | 22 ++++++------------- components/fpspreadsheet/xlsxooxml.pas | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas b/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas index 718dc767a..0844cbb7f 100644 --- a/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas +++ b/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas @@ -70,7 +70,7 @@ var implementation uses - LclIntf, StrUtils, fpsUtils; + LclIntf, StrUtils, fpsUtils, fpsRegFileFormats; {$R *.lfm} diff --git a/components/fpspreadsheet/fpsutils.pas b/components/fpspreadsheet/fpsutils.pas index e3b8f6bd5..5e5840abb 100644 --- a/components/fpspreadsheet/fpsutils.pas +++ b/components/fpspreadsheet/fpsutils.pas @@ -103,7 +103,7 @@ function GetCellString_R1C1(ARow, ACol: Cardinal; AFlags: TsRelFlags = [rfRelRow function GetErrorValueStr(AErrorValue: TsErrorValue): String; function TryStrToErrorValue(AErrorStr: String; out AErr: TsErrorValue): boolean; -//function GetFileFormatName(AFormat: TsSpreadsheetFormat): string; +function GetFileFormatName(AFormat: TsSpreadsheetFormat): string; deprecated; //function GetFileFormatExt(AFormat: TsSpreadsheetFormat): String; function GetFormatFromFileName(const AFileName: TFileName; out AFormatID: TsSpreadFormatID): Boolean; overload; @@ -1044,30 +1044,22 @@ begin end; end; -(* {@@ ---------------------------------------------------------------------------- Returns the name of the given spreadsheet file format. @param AFormat Identifier of the file format @return 'BIFF2', 'BIFF3', 'BIFF4', 'BIFF5', 'BIFF8', 'OOXML', 'Open Document', 'CSV, 'WikiTable Pipes', or 'WikiTable WikiMedia" + + @Note This function is deprecated. Use GetSpreadFormatName or + GetSpreadTechnicalName of fpsRegFileformats instead in order to + be able to process user-defined formats as well. -------------------------------------------------------------------------------} function GetFileFormatName(AFormat: TsSpreadsheetFormat): string; begin - case AFormat of - sfExcel2 : Result := 'BIFF2'; - sfExcel5 : Result := 'BIFF5'; - sfExcel8 : Result := 'BIFF8'; - sfooxml : Result := 'OOXML'; - sfOpenDocument : Result := 'Open Document'; - sfCSV : Result := 'CSV'; - sfHTML : Result := 'HTML'; - sfWikiTable_Pipes : Result := 'WikiTable Pipes'; - sfWikiTable_WikiMedia : Result := 'WikiTable WikiMedia'; - else Result := rsUnknownSpreadsheetFormat; - end; + Result := GetSpreadTechnicalName(ord(AFormat)); end; - + (* {@@ ---------------------------------------------------------------------------- Returns the default extension of each spreadsheet file format diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas index 0b713c44e..70cb3c397 100755 --- a/components/fpspreadsheet/xlsxooxml.pas +++ b/components/fpspreadsheet/xlsxooxml.pas @@ -3600,7 +3600,7 @@ begin { Now compress the files } FZip := TZipper.Create; try -// FZip.FileName := '__temp__.tmp'; +// FZip.FileName := '__temp__.tmp'; FZip.Entries.AddFileEntry(FSContentTypes, OOXML_PATH_TYPES); FZip.Entries.AddFileEntry(FSRelsRels, OOXML_PATH_RELS_RELS); FZip.Entries.AddFileEntry(FSWorkbookRels, OOXML_PATH_XL_RELS_RELS);