Update VBA-UTC to v1.0.2

Djtrip83 · Jun 6, 2016 · 1a955ea · 1a955ea
1 parent 8cc44a5
commit 1a955ea
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/JsonConverter.bas b/JsonConverter.bas
@@ -880,7 +880,7 @@ Private Function json_UnsignedAdd(json_Start As Long, json_Increment As Long) As
 End Function
 
 ''
-' VBA-UTC v1.0.1
+' VBA-UTC v1.0.2
 ' (c) Tim Hall - https://github.com/VBA-tools/VBA-UtcConverter
 '
 ' UTC/ISO 8601 Converter for VBA
@@ -1005,7 +1005,8 @@ Public Function ParseIso(utc_IsoString As String) As Date
                 Case 1
                     utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0)), VBA.CInt(utc_OffsetParts(1)), 0)
                 Case 2
-                    utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0)), VBA.CInt(utc_OffsetParts(1)), VBA.CInt(utc_OffsetParts(2)))
+                    ' VBA.Val does not use regional settings, use for seconds to avoid decimal/comma issues
+                    utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0)), VBA.CInt(utc_OffsetParts(1)), Int(VBA.Val(utc_OffsetParts(2))))
                 End Select
 
                 If utc_NegativeOffset Then: utc_Offset = -utc_Offset
@@ -1020,13 +1021,14 @@ Public Function ParseIso(utc_IsoString As String) As Date
         Case 1
             ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0)), VBA.CInt(utc_TimeParts(1)), 0)
         Case 2
-            ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0)), VBA.CInt(utc_TimeParts(1)), VBA.CInt(utc_TimeParts(2)))
+            ' VBA.Val does not use regional settings, use for seconds to avoid decimal/comma issues
+            ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0)), VBA.CInt(utc_TimeParts(1)), Int(VBA.Val(utc_TimeParts(2))))
         End Select
-
+
+        ParseIso = ParseUtc(ParseIso)
+
         If utc_HasOffset Then
             ParseIso = ParseIso + utc_Offset
-        Else
-            ParseIso = ParseUtc(ParseIso)
         End If
     End If