Changeset 38 for trunk/Packages/Common/UXMLUtils.pas

Timestamp:

May 10, 2018, 9:39:53 AM (7 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.

File:

• trunk/Packages/Common/UXMLUtils.pas (modified) (15 diffs)

trunk/Packages/Common/UXMLUtils.pas

@@ -7 +7 @@
 uses
   {$IFDEF WINDOWS}Windows,{$ENDIF}
-  Classes, SysUtils, DateUtils, XMLRead, XMLWrite, DOM;
+  Classes, SysUtils, DateUtils, DOM;
 
 function XMLTimeToDateTime(XMLDateTime: string): TDateTime;
-function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
+function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
 procedure WriteInteger(Node: TDOMNode; Name: string; Value: Integer);
 procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
@@ -30 +30 @@
   TimeZoneInfo: TTimeZoneInformation;
 begin
+  {$push}{$warn 5057 off}
   case GetTimeZoneInformation(TimeZoneInfo) of
-  TIME_ZONE_ID_STANDARD: Result := TimeZoneInfo.Bias + TimeZoneInfo.StandardBias;
-  TIME_ZONE_ID_DAYLIGHT: Result := TimeZoneInfo.Bias + TimeZoneInfo.DaylightBias;
+    TIME_ZONE_ID_STANDARD: Result := TimeZoneInfo.Bias + TimeZoneInfo.StandardBias;
+    TIME_ZONE_ID_DAYLIGHT: Result := TimeZoneInfo.Bias + TimeZoneInfo.DaylightBias;
   else
     Result := 0;
   end;
+  {$pop}
 end;
 {$ELSE}
@@ -45 +47 @@
 function LeftCutString(var Source: string; out Output: string; Delimiter: string; Allowed: string = ''): Boolean;
 var
-  I, J: Integer;
+  I: Integer;
   Matched: Boolean;
 begin
@@ -99 +101 @@
       if Pos('Z', XMLDateTime) > 0 then
         LeftCutString(XMLDateTime, Part, 'Z');
-      SecondFraction := StrToFloat('0' + DecimalSeparator + Part);
+      SecondFraction := StrToFloat('0' + DefaultFormatSettings.DecimalSeparator + Part);
       Millisecond := Trunc(SecondFraction * 1000);
     end else begin
@@ -118 +120 @@
 end;
 
-function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
+function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
 const
   Neg: array[Boolean] of string =  ('+', '-');
@@ -139 +141 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := IntToStr(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(IntToStr(Value));
   Node.AppendChild(NewNode);
 end;
@@ -148 +150 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := IntToStr(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(IntToStr(Value));
   Node.AppendChild(NewNode);
 end;
@@ -157 +159 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := BoolToStr(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(BoolToStr(Value));
   Node.AppendChild(NewNode);
 end;
@@ -166 +168 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := Value;
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(Value);
   Node.AppendChild(NewNode);
 end;
@@ -175 +177 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := DateTimeToXMLTime(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(DateTimeToXMLTime(Value));
   Node.AppendChild(NewNode);
 end;
@@ -185 +187 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := StrToInt(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToInt(string(NewNode.TextContent));
 end;
 
@@ -195 +197 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := StrToInt64(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToInt64(string(NewNode.TextContent));
 end;
 
@@ -205 +207 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := StrToBool(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToBool(string(NewNode.TextContent));
 end;
 
@@ -215 +217 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := NewNode.TextContent;
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := string(NewNode.TextContent);
 end;
 
@@ -226 +228 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := XMLTimeToDateTime(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := XMLTimeToDateTime(string(NewNode.TextContent));
 end;