* Fix bug ID #24752

git-svn-id: trunk@30628 -
This commit is contained in:
michael 2015-04-17 19:57:48 +00:00
parent 3e100245e0
commit f9f602dca6

View File

@ -2539,9 +2539,9 @@ function UniversalTimeToLocal(UT: TDateTime; TZOffset : Integer): TDateTime;
begin begin
if (TZOffset > 0) then if (TZOffset > 0) then
Result := UT - EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0) Result := UT + EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0)
else if (TZOffset < 0) then else if (TZOffset < 0) then
Result := UT + EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0) Result := UT - EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0)
else else
Result := UT; Result := UT;
end; end;
@ -2556,9 +2556,9 @@ Function LocalTimeToUniversal(LT: TDateTime;TZOffset: Integer): TDateTime;
begin begin
if (TZOffset > 0) then if (TZOffset > 0) then
Result := LT + EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0) Result := LT - EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0)
else if (TZOffset < 0) then else if (TZOffset < 0) then
Result := LT - EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0) Result := LT + EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0)
else else
Result := LT; Result := LT;
end; end;