From fa1ffd579fa749cdac20525f72fd2948c4af434b Mon Sep 17 00:00:00 2001 From: joshy Date: Wed, 3 Jul 2013 00:01:48 +0000 Subject: [PATCH] NaN (Not A Number) values now are read as '' (nothing) instead as "NaN". git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2760 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/fpspreadsheet.pas | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas index 3d948110c..42f764829 100755 --- a/components/fpspreadsheet/fpspreadsheet.pas +++ b/components/fpspreadsheet/fpspreadsheet.pas @@ -665,6 +665,10 @@ end; function TsWorksheet.ReadAsUTF8Text(ARow, ACol: Cardinal): ansistring; var ACell: PCell; + function FloatToStrNoNaN(const Value: Double): ansistring; + begin + if IsNan(Value) then Result:='' else Result:=FloatToStr(Value); + end; begin ACell := FindCell(ARow, ACol); @@ -677,7 +681,7 @@ begin case ACell^.ContentType of //cctFormula - cctNumber: Result := FloatToStr(ACell^.NumberValue); + cctNumber: Result := FloatToStrNoNaN(ACell^.NumberValue); cctUTF8String: Result := ACell^.UTF8StringValue; cctDateTime: Result := SysUtils.DateToStr(ACell^.DateTimeValue); else