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

* TsWorksheet.ReadAsUTF8Text: readasdate also reads time values unless sure cell is date-only. Thanks wp for the suggestions!

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2861 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
bigchimp
2013-12-10 12:23:02 +00:00
parent da12b16bb5
commit f1c9fb3597
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -689,11 +689,18 @@ begin
end; end;
case ACell^.ContentType of case ACell^.ContentType of
//cctFormula //cctFormula
cctNumber: Result := FloatToStrNoNaN(ACell^.NumberValue); cctNumber: Result := FloatToStrNoNaN(ACell^.NumberValue);
cctUTF8String: Result := ACell^.UTF8StringValue; cctUTF8String: Result := ACell^.UTF8StringValue;
cctDateTime: Result := SysUtils.DateToStr(ACell^.DateTimeValue); cctDateTime:
begin
Result := SysUtils.DateToStr(ACell^.DateTimeValue);
// User can have specified custom date/time format or one of the other built
// in formats that include time. We can't parse all of them so just return
// time as well unless absolutely sure we only want a date
if ACell^.NumberFormat<>nfShortDate then
Result := Result+' ' + SysUtils.TimeToStr(ACell^.DateTimeValue);
end;
else else
Result := ''; Result := '';
end; end;