mirror of
https://github.com/Kirill/simplexml.git
synced 2025-07-17 11:07:43 +02:00
Merge pull request #1 from dvorkin/master
Correct reading nulls from XML file
This commit is contained in:
@ -2642,14 +2642,20 @@ begin
|
|||||||
Set_Text(aValue)
|
Set_Text(aValue)
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
function GetVarVal(aValue: TXmlString): Variant;
|
||||||
|
begin
|
||||||
|
if aValue = XSTR_NULL then Result := null
|
||||||
|
else Result := aValue
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TXmlNode.SetAttr(const aName, aValue: TXmlString);
|
procedure TXmlNode.SetAttr(const aName, aValue: TXmlString);
|
||||||
begin
|
begin
|
||||||
SetVarAttr(FNames.GetID(aName), aValue)
|
SetVarAttr(FNames.GetID(aName), GetVarVal(aValue))
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TXmlNode.SetAttr(aNameID: Integer; const aValue: TXmlString);
|
procedure TXmlNode.SetAttr(aNameID: Integer; const aValue: TXmlString);
|
||||||
begin
|
begin
|
||||||
SetVarAttr(aNameID, aValue)
|
SetVarAttr(aNameID, GetVarVal(aValue))
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TXmlNode.SetBoolAttr(aNameID: Integer; aValue: Boolean);
|
procedure TXmlNode.SetBoolAttr(aNameID: Integer; aValue: Boolean);
|
||||||
|
Reference in New Issue
Block a user