Browse Source

* Fixed some small bugs
- some methods where 'virtual' instead of 'override' in dom.pp
- corrections regaring wether NodeName or NodeValue is used, for
some node types (Entity, EntityReference)

sg 25 years ago
parent
commit
63e6473af4
2 changed files with 19 additions and 7 deletions
  1. 11 5
      fcl/xml/dom.pp
  2. 8 2
      fcl/xml/xmlwrite.pp

+ 11 - 5
fcl/xml/dom.pp

@@ -375,10 +375,10 @@ type
 
 
   TXMLDocument = class(TDOMDocument)
   TXMLDocument = class(TDOMDocument)
   public
   public
-    function CreateCDATASection(const data: DOMString): TDOMCDATASection; virtual;
+    function CreateCDATASection(const data: DOMString): TDOMCDATASection; override;
     function CreateProcessingInstruction(const target, data: DOMString):
     function CreateProcessingInstruction(const target, data: DOMString):
-      TDOMProcessingInstruction; virtual;
-    function CreateEntityReference(const name: DOMString): TDOMEntityReference; virtual;
+      TDOMProcessingInstruction; override;
+    function CreateEntityReference(const name: DOMString): TDOMEntityReference; override;
 
 
     // Extensions to DOM interface:
     // Extensions to DOM interface:
     XMLVersion, Encoding: String;
     XMLVersion, Encoding: String;
@@ -1139,7 +1139,7 @@ end;
 function TDOMDocument.CreateEntity(const data: DOMString): TDOMEntity;
 function TDOMDocument.CreateEntity(const data: DOMString): TDOMEntity;
 begin
 begin
   Result := TDOMEntity.Create(Self);
   Result := TDOMEntity.Create(Self);
-  Result.FNodeValue := data;
+  Result.FNodeName := data;
 end;
 end;
 
 
 function TDOMDocument.GetElementsByTagName(const tagname: DOMString): TDOMNodeList;
 function TDOMDocument.GetElementsByTagName(const tagname: DOMString): TDOMNodeList;
@@ -1499,7 +1499,13 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.2  2000-07-13 11:33:07  michael
+  Revision 1.3  2000-07-25 09:20:08  sg
+  * Fixed some small bugs
+    - some methods where 'virtual' instead of 'override' in dom.pp
+    - corrections regaring wether NodeName or NodeValue is used, for
+      some node types (Entity, EntityReference)
+
+  Revision 1.2  2000/07/13 11:33:07  michael
   + removed logs
   + removed logs
  
  
 }
 }

+ 8 - 2
fcl/xml/xmlwrite.pp

@@ -261,7 +261,7 @@ end;
 
 
 procedure WriteEntityRef(node: TDOMNode);
 procedure WriteEntityRef(node: TDOMNode);
 begin
 begin
-  wrt('&' + node.NodeValue + ';');
+  wrt('&' + node.NodeName + ';');
 end;
 end;
 
 
 procedure WriteEntity(node: TDOMNode);
 procedure WriteEntity(node: TDOMNode);
@@ -398,7 +398,13 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.2  2000-07-13 11:33:08  michael
+  Revision 1.3  2000-07-25 09:20:08  sg
+  * Fixed some small bugs
+    - some methods where 'virtual' instead of 'override' in dom.pp
+    - corrections regaring wether NodeName or NodeValue is used, for
+      some node types (Entity, EntityReference)
+
+  Revision 1.2  2000/07/13 11:33:08  michael
   + removed logs
   + removed logs
  
  
 }
 }