Index: TECH/File/impl/FileWriter.cls.xml
===================================================================
diff -u -r970 -r1066
--- TECH/File/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 970)
+++ TECH/File/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 1066)
@@ -3,7 +3,7 @@
 <Class name="TECH.File.impl.FileWriter">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.File.FileWriter,%RegisteredObject</Super>
+<Super>TECH.File.FileWriter,TECH.RegisteredObject</Super>
 
 <Property name="FileCharacterStream">
 <Type>%Library.FileCharacterStream</Type>
@@ -148,15 +148,16 @@
 </Method>
 
 <Method name="WriteXML">
-<FormalSpec>XMLObject:%XML.Adaptor,XMLExportOpties:%String="literal,indent",TopTag:%String=""</FormalSpec>
+<FormalSpec>XMLObject:%XML.Adaptor,XMLExportOpties:%String="literal,indent",TopTag:%String="",XMLDeclaration:%Boolean=1</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set Status = XMLObject.XMLExportToStream(..FileCharacterStream, TopTag, XMLExportOpties)
-	If $$$ISERR(Status){
-		Set Exception = ##class(TECH.Exceptions.FileException).%New("Kon niet exporteren naar XML '"_XMLObject_"'.",Status)
-		Do ##class(TECH.ExceptionHandler).Throw(Exception)	
-	}
-	Quit Status
+	Set writer = ##class(%XML.Writer).%New()
+	Set writer.Charset="UTF-8"
+	Set writer.Indent= XMLExportOpties["indent"
+	Set writer.NoXMLDeclaration =$$$Not(XMLDeclaration)
+	do writer.OutputToStream(..FileCharacterStream)
+	do writer.RootObject(XMLObject, .TopTag) 
+	quit
 ]]></Implementation>
 </Method>