Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml
===================================================================
diff -u -r60106 -r60124
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml	(.../PuntBoring.cls.xml)	(revision 60106)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml	(.../PuntBoring.cls.xml)	(revision 60124)
@@ -31,10 +31,7 @@
 <Method name="XMLExport">
 <FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set val=..SvgBox
-   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+<Implementation><![CDATA[	Quit ..SvgBox.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml
===================================================================
diff -u -r60106 -r60124
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 60106)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 60124)
@@ -26,7 +26,7 @@
 <Implementation><![CDATA[
 	;Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
 	Set ..BasisElementFactory =##class(TECH.Svg.BasisElementFactory).%New()
-	#Dim CrossDiag as APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height, Kleur)
+	Set CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height, Kleur)
 	Set Circle = ..BasisElementFactory.MaakCirkel(Width/2,Height/2,(Width/2.2))
 	Do Circle.SetFill(Kleur)
 	Set ..SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
@@ -41,9 +41,8 @@
 <FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set val=..SvgBox
-   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+	
+	Quit ..SvgBox.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml
===================================================================
diff -u -r60049 -r60124
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml	(.../CrossDiag.cls.xml)	(revision 60049)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml	(.../CrossDiag.cls.xml)	(revision 60124)
@@ -39,9 +39,13 @@
 <Implementation><![CDATA[
 	Set val=..TopLine
    	Set sc = val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
- 	Set val=..BottomLine
-   	Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+   	if ('sc) {
+   		Quit sc 
+   	}Else {
+ 		Set val=..BottomLine
+   		Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+		Quit sc
+   	}
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml
===================================================================
diff -u -r60049 -r60124
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml	(.../CrossVH.cls.xml)	(revision 60049)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml	(.../CrossVH.cls.xml)	(revision 60124)
@@ -39,9 +39,13 @@
 <Implementation><![CDATA[
 	Set val=..HorizontalLine
    	Set sc = val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
- 	Set val=..VerticalLine
-   	Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+   	if ('sc) {
+   		Quit sc 
+   	}Else {
+ 		Set val=..VerticalLine
+   		Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+		Quit sc
+   	}
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml
===================================================================
diff -u -r60049 -r60124
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 60049)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 60124)
@@ -34,10 +34,7 @@
 <Method name="XMLExport">
 <FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set val=..SvgBox
-   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+<Implementation><![CDATA[	Quit ..SvgBox.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml
===================================================================
diff -u -r60049 -r60124
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 60049)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 60124)
@@ -39,9 +39,13 @@
 <Implementation><![CDATA[
 	Set val=..HorizontalLine
    	Set sc = val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
- 	Set val=..VerticalLine
-   	Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+   	if ('sc) {
+   		Quit sc 
+   	}Else {
+ 		Set val=..VerticalLine
+   		Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+		Quit sc
+   	}
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml
===================================================================
diff -u -r60106 -r60124
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml	(.../DoorBoring.cls.xml)	(revision 60106)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml	(.../DoorBoring.cls.xml)	(revision 60124)
@@ -33,9 +33,8 @@
 <FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set val=..SvgBox
-   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+	
+	Quit ..SvgBox.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
 ]]></Implementation>
 </Method>