diff --git a/wst/trunk/base_soap_formatter.pas b/wst/trunk/base_soap_formatter.pas index a3c120126..c31a476b0 100644 --- a/wst/trunk/base_soap_formatter.pas +++ b/wst/trunk/base_soap_formatter.pas @@ -2136,11 +2136,7 @@ end; function TEmbeddedArrayStackItem.CreateList(const ANodeName: string): TDOMNodeList; begin if ScopeObject.HasChildNodes() then begin -{$IFDEF WST_DELPHI} - Result := FilterList(ScopeObject.ChildNodes,ANodeName); -{$ELSE} Result := FilterList(ScopeObject,ANodeName); -{$ENDIF WST_DELPHI} end else begin Result := nil; end; diff --git a/wst/trunk/wst_delphi_xml.pas b/wst/trunk/wst_delphi_xml.pas index 0435557d4..b9023a8c2 100644 --- a/wst/trunk/wst_delphi_xml.pas +++ b/wst/trunk/wst_delphi_xml.pas @@ -32,7 +32,8 @@ type procedure ReadXMLFile(out ADoc: TXMLDocument; const AFilename: String);overload; function NodeToBuffer(ANode : TDOMNode):string ; - function FilterList(const ALIst : IDOMNodeList; const ANodeName : widestring):IDOMNodeList ;{$IFDEF USE_INLINE}inline;{$ENDIF} + function FilterList(const ALIst : IDOMNodeList; const ANodeName : DOMString):IDOMNodeList;overload;{$IFDEF USE_INLINE}inline;{$ENDIF} + function FilterList(const ANode : TDOMNode; const ANodeName : DOMString):IDOMNodeList;overload;{$IFDEF USE_INLINE}inline;{$ENDIF} implementation uses XmlDoc; @@ -172,6 +173,11 @@ begin Result := TDOMNodeSelectListImp.Create(ALIst,ANodeName); end; +function FilterList(const ANode : TDOMNode; const ANodeName : DOMString):IDOMNodeList; +begin + Result := FilterList(ANode.ChildNodes,ANodeName); +end; + { TDOMNodeSelectListImp } constructor TDOMNodeSelectListImp.Create(