From 8ff3813be2fea0e7096386d91122435eb8e031c2 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 14 Jul 2019 21:14:14 +0000 Subject: [PATCH] fpspreadsheet: Add format string to number format error messages. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7036 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../examples/read_write/excelxmldemo/excelxmlwrite.lpr | 10 ++++++++++ .../fpspreadsheet/source/common/fpspreadsheet.pas | 4 ++-- components/fpspreadsheet/source/common/fpsstrings.pas | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr index c63d502b2..b84289b60 100644 --- a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr +++ b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr @@ -36,6 +36,8 @@ var s: String; begin + WriteLn('Creating a demo file in Excel2003/XML format...'); + MyDir := ExtractFilePath(ParamStr(0)); // Create the spreadsheet @@ -394,5 +396,13 @@ begin // Save the spreadsheet to a file MyWorkbook.WriteToFile(MyDir + 'test.xml', sfExcelXML, true); MyWorkbook.Free; + + WriteLn('Done.'); + WriteLn('File saved as "' + MyDir + 'text.xml"'); + {$IFDEF WINDOWS} + WriteLn; + WriteLn('Press ENTER to quit.'); + ReadLn; + {$ENDIF} end. diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas index edfd94835..0461ea593 100644 --- a/components/fpspreadsheet/source/common/fpspreadsheet.pas +++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas @@ -5595,10 +5595,10 @@ begin try // Format string ok? if parser.Status <> psOK then - raise EFPSpreadsheet.Create(rsNoValidNumberFormatString); + raise EFPSpreadsheet.CreateFmt(rsNoValidNumberFormatString, [ANumFormatStr]); // Make sure that we do not use a number format for date/times values. if not parser.IsDateTimeFormat then - raise EFPSpreadsheet.Create(rsInvalidDateTimeFormat); + raise EFPSpreadsheet.CreateFmt(rsInvalidDateTimeFormat, [ANumFormatStr]); // Avoid possible duplication of standard formats if ANumFormat = nfCustom then ANumFormat := parser.NumFormat; diff --git a/components/fpspreadsheet/source/common/fpsstrings.pas b/components/fpspreadsheet/source/common/fpsstrings.pas index 5d7202759..76d4b7555 100644 --- a/components/fpspreadsheet/source/common/fpsstrings.pas +++ b/components/fpspreadsheet/source/common/fpsstrings.pas @@ -128,10 +128,10 @@ resourcestring // Format rsAmbiguousDecThouSeparator = 'Assuming usage of decimal separator in "%s".'; - rsInvalidDateTimeFormat = 'Trying to use an incompatible date/time format.'; + rsInvalidDateTimeFormat = 'Trying to use an incompatible date/time format (%s).'; rsInvalidFontIndex = 'Invalid font index'; rsInvalidNumberFormat = 'Trying to use an incompatible number format.'; - rsNoValidNumberFormatString = 'No valid number format string.'; + rsNoValidNumberFormatString = 'No valid number format string (%s).'; // Formulas rsFormulaNotSupported = 'The formula in cell %s is not supported by this file format: %s';