@@ -144,14 +144,10 @@ Const AUTOPROXY_DETECT_TYPE_DNS = 2
144144' === VBA-UTC Headers
145145#If Mac Then
146146
147- Private Declare Function utc_popen Lib "libc .dylib " Alias "popen " _
148- (ByVal utc_Command As String , ByVal utc_Mode As String ) As Long
149- Private Declare Function utc_pclose Lib "libc .dylib " Alias "pclose " _
150- (ByVal utc_File As Long ) As Long
151- Private Declare Function utc_fread Lib "libc .dylib " Alias "fread " _
152- (ByVal utc_Buffer As String , ByVal utc_Size As Long , ByVal utc_Number As Long , ByVal utc_File As Long ) As Long
153- Private Declare Function utc_feof Lib "libc .dylib " Alias "feof " _
154- (ByVal utc_File As Long ) As Long
147+ Private Declare Function utc_popen Lib "libc .dylib " Alias "popen " (ByVal utc_Command As String , ByVal utc_Mode As String ) As Long
148+ Private Declare Function utc_pclose Lib "libc .dylib " Alias "pclose " (ByVal utc_File As Long ) As Long
149+ Private Declare Function utc_fread Lib "libc .dylib " Alias "fread " (ByVal utc_Buffer As String , ByVal utc_Size As Long , ByVal utc_Number As Long , ByVal utc_File As Long ) As Long
150+ Private Declare Function utc_feof Lib "libc .dylib " Alias "feof " (ByVal utc_File As Long ) As Long
155151
156152#ElseIf VBA7 Then
157153
@@ -1906,7 +1902,7 @@ Private Function web_GetUrlEncodedKeyValue(Key As Variant, Value As Variant, Opt
19061902End Function
19071903
19081904''
1909- ' VBA-JSON v2.2.0
1905+ ' VBA-JSON v2.2.1
19101906' (c) Tim Hall - https://github.com/VBA-tools/VBA-JSON
19111907'
19121908' JSON Converter for VBA
@@ -2690,7 +2686,7 @@ Private Function json_UnsignedAdd(json_Start As Long, json_Increment As Long) As
26902686End Function
26912687
26922688''
2693- ' VBA-UTC v1.0.1
2689+ ' VBA-UTC v1.0.2
26942690' (c) Tim Hall - https://github.com/VBA-tools/VBA-UtcConverter
26952691'
26962692' UTC/ISO 8601 Converter for VBA
@@ -2815,7 +2811,8 @@ Public Function ParseIso(utc_IsoString As String) As Date
28152811 Case 1
28162812 utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0 )), VBA.CInt(utc_OffsetParts(1 )), 0 )
28172813 Case 2
2818- utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0 )), VBA.CInt(utc_OffsetParts(1 )), VBA.CInt(utc_OffsetParts(2 )))
2814+ ' VBA.Val does not use regional settings, use for seconds to avoid decimal/comma issues
2815+ utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0 )), VBA.CInt(utc_OffsetParts(1 )), Int(VBA.Val(utc_OffsetParts(2 ))))
28192816 End Select
28202817
28212818 If utc_NegativeOffset Then : utc_Offset = -utc_Offset
@@ -2830,13 +2827,14 @@ Public Function ParseIso(utc_IsoString As String) As Date
28302827 Case 1
28312828 ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0 )), VBA.CInt(utc_TimeParts(1 )), 0 )
28322829 Case 2
2833- ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0 )), VBA.CInt(utc_TimeParts(1 )), VBA.CInt(utc_TimeParts(2 )))
2830+ ' VBA.Val does not use regional settings, use for seconds to avoid decimal/comma issues
2831+ ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0 )), VBA.CInt(utc_TimeParts(1 )), Int(VBA.Val(utc_TimeParts(2 ))))
28342832 End Select
28352833
2834+ ParseIso = ParseUtc(ParseIso)
2835+
28362836 If utc_HasOffset Then
28372837 ParseIso = ParseIso + utc_Offset
2838- Else
2839- ParseIso = ParseUtc(ParseIso)
28402838 End If
28412839 End If
28422840
0 commit comments