printers: fixed combining date+time

git-svn-id: trunk@47625 -
This commit is contained in:
mattias 2015-02-07 12:01:44 +00:00
parent 0d19bf6dd6
commit 757729e0d9

View File

@ -229,8 +229,8 @@ begin
begin begin
Try Try
if lTime^.tm_year=70 then Exit; if lTime^.tm_year=70 then Exit;
Dt:=EncodeDate(lTime^.tm_year+1900,lTime^.tm_mon+1,lTime^.tm_mday)+ Dt:=ComposeDateTime(EncodeDate(lTime^.tm_year+1900,lTime^.tm_mon+1,lTime^.tm_mday),
EncodeTime(lTime^.tm_hour,lTime^.tm_min,lTime^.tm_sec,0); EncodeTime(lTime^.tm_hour,lTime^.tm_min,lTime^.tm_sec,0));
Result:=DateTimeToStr(Dt); Result:=DateTimeToStr(Dt);
Except Except
end; end;