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

fpspreadsheet: Fix conversion of string to date/time raising an exception in case of invalid date/time strings.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3577 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-09-18 11:58:51 +00:00
parent 4ecfdd0ef4
commit 4f941218df
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/fpspreadsheet/fpspreadsheet.pas
View File

@@ -3502,7 +3502,7 @@ begin
isPercent := Pos('%', AValue) = Length(AValue); isPercent := Pos('%', AValue) = Length(AValue);
if isPercent then Delete(AValue, Length(AValue), 1); if isPercent then Delete(AValue, Length(AValue), 1);
if TryStrToFloat(AValue, number) then begin if TryStrToFloat(AValue, number, FWorkbook.FormatSettings) then begin
if isPercent then if isPercent then
WriteNumber(ACell, number/100, nfPercentage) WriteNumber(ACell, number/100, nfPercentage)
else begin else begin
@@ -3515,7 +3515,7 @@ begin
exit; exit;
end; end;
if TryStrToDateTime(AValue, number) then begin if TryStrToDateTime(AValue, number, FWorkbook.FormatSettings) then begin
if number < 1.0 then begin // this is a time alone if number < 1.0 then begin // this is a time alone
if not IsTimeFormat(ACell^.NumberFormat) then begin if not IsTimeFormat(ACell^.NumberFormat) then begin
ACell^.NumberFormat := nfLongTime; ACell^.NumberFormat := nfLongTime;