Pārlūkot izejas kodu

* Fixed TryEncodeDateTime. Adding a date and a time is not valid for dates before 1899-12-30, use ComposeDateTime instead

git-svn-id: trunk@12561 -
joost 16 gadi atpakaļ
vecāks
revīzija
d2d4aa22db
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. 1 1
      rtl/objpas/dateutil.inc

+ 1 - 1
rtl/objpas/dateutil.inc

@@ -1517,7 +1517,7 @@ begin
   Result:=TryEncodeDate(AYear,AMonth,ADay,AValue);
   Result:=TryEncodeDate(AYear,AMonth,ADay,AValue);
   Result:=Result and TryEncodeTime(AHour,AMinute,ASecond,Amillisecond,Tmp);
   Result:=Result and TryEncodeTime(AHour,AMinute,ASecond,Amillisecond,Tmp);
   If Result then
   If Result then
-    Avalue:=AValue+Tmp;
+    Avalue:=ComposeDateTime(AValue,Tmp);
 end;
 end;
 
 
 { ---------------------------------------------------------------------
 { ---------------------------------------------------------------------