From 12a4c4c07b925408edad443b7bc012a3194a10b4 Mon Sep 17 00:00:00 2001
From: bigchimp <bigchimp@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 23 Mar 2014 13:06:19 +0000
Subject: [PATCH] * LibreOffice/ODS format: fix time-only calculations
 exceeding EncodeDate limits

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2909 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/fpsopendocument.pas | 37 ++++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/components/fpspreadsheet/fpsopendocument.pas b/components/fpspreadsheet/fpsopendocument.pas
index 571f23055..768fdb47a 100755
--- a/components/fpspreadsheet/fpsopendocument.pas
+++ b/components/fpspreadsheet/fpsopendocument.pas
@@ -288,7 +288,7 @@ begin
     // Don't merge, or else we can't debug
     Str := GetAttrValue(ACellNode,'office:value');
     lNumber := StrToFloat(Str,FSettings);
-    FWorkSheet.WriteNumber(Arow,ACol,lNumber);
+    FWorkSheet.WriteNumber(ARow,ACol,lNumber);
   end;
 end;
 
@@ -327,35 +327,34 @@ begin
     Value:=GetAttrValue(ACellNode,'office:time-value');
     if (Value<>'') and (Pos('PT',Value)=1) then
     begin
-      dt:=DATEMODE_1900_BASE; //todo: detect based on sheet format; see xls code
       // Get hours
       HoursPos:=Pos('H',Value);
       if (HoursPos>0) then
-      begin
-        Hours:=StrToInt(Copy(Value,3,HoursPos-3));
-        case Hours of
-        0..23: dt:=dt+EncodeTime(Hours,0,0,0)
-        else dt:=dt+EncodeDateTime(0,0,Hours div 24,Hours mod 24,0,0,0);
-        end;
-      end;
+        Hours:=StrToInt(Copy(Value,3,HoursPos-3))
+      else
+        Hours:=0;
 
       // Get minutes
       MinutesPos:=Pos('M',Value);
       if (MinutesPos>0) and (MinutesPos>HoursPos) then
-      begin
-        Minutes:=StrToInt(Copy(Value,HoursPos+1,MinutesPos-HoursPos-1));
-        if Minutes>0 then
-          dt:=dt+EncodeTime(Minutes div 60,Minutes mod 60,0,0)
-      end;
+        Minutes:=StrToInt(Copy(Value,HoursPos+1,MinutesPos-HoursPos-1))
+      else
+        Minutes:=0;
 
       // Get seconds
       SecondsPos:=Pos('S',Value);
       if (SecondsPos>0) and (SecondsPos>MinutesPos) then
-      begin
-        Seconds:=StrToInt(Copy(Value,MinutesPos+1,SecondsPos-MinutesPos-1));
-        if Seconds>0 then
-          dt:=dt+EncodeTime(0,Seconds div 60,Seconds mod 60,0)
-      end;
+        Seconds:=StrToInt(Copy(Value,MinutesPos+1,SecondsPos-MinutesPos-1))
+      else
+        Seconds:=0;
+
+      // Convert to date/time via Unix timestamp so avoiding limits for number of
+      // hours etc in EncodeDateTime. Perhaps there's a faster way of doing this?
+      dt:=DATEMODE_1900_BASE-UnixEpoch-1+UnixToDateTime(
+        Hours*(MinsPerHour*SecsPerMin)+
+        Minutes*(SecsPerMin)+
+        Seconds
+        ); //todo: detect actually used date mode based on file settings; see xls code
     end;
   end;
   FWorkSheet.WriteDateTime(Arow,ACol,dt);