XML reader, forgot to pass current settings to the nested reader (although it doesn't seem to change test suite behavior).

git-svn-id: trunk@16048 -
This commit is contained in:
sergei 2010-09-26 19:50:37 +00:00
parent f3713b9f5e
commit 3648247faf

View File

@ -1275,6 +1275,8 @@ constructor TXMLReader.Create(AParser: TDOMParser);
begin begin
Create; Create;
FCtrl := AParser; FCtrl := AParser;
if FCtrl = nil then
Exit;
FValidate := FCtrl.Options.Validate; FValidate := FCtrl.Options.Validate;
FPreserveWhitespace := FCtrl.Options.PreserveWhitespace; FPreserveWhitespace := FCtrl.Options.PreserveWhitespace;
FExpandEntities := FCtrl.Options.ExpandEntities; FExpandEntities := FCtrl.Options.ExpandEntities;
@ -1681,7 +1683,7 @@ begin
if not Result.FResolved then if not Result.FResolved then
begin begin
// To build children of the entity itself, we must parse it "out of context" // To build children of the entity itself, we must parse it "out of context"
InnerReader := TXMLReader.Create; InnerReader := TXMLReader.Create(FCtrl);
try try
EntityToSource(Result, Src); EntityToSource(Result, Src);
Result.SetReadOnly(False); Result.SetReadOnly(False);