Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r61903 -r61909
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61903)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61909)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService,SvgBox:TECH.Svg.Basis.SvgBox</FormalSpec>
+<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r61905 -r61909
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61905)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61909)
@@ -17,15 +17,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService,SvgBox:TECH.Svg.Basis.SvgBox</FormalSpec>
+<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..SvgBox = $$$Inject(SvgBox, ##class(TECH.Svg.Basis.SvgBox).%New())
 	Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
 	Set ..CoordinatesService = $$$Inject(CoordinatesService, ##class(TECH.Svg.Services.CoordinatesService).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -34,23 +34,26 @@
 <FormalSpec>VmlId:%String,Breedte:%Integer,Lengte:%Integer,Rotation:%Integer,YPos:%Integer=0</FormalSpec>
 <ReturnType>TECH.Svg.Basis.SvgBox</ReturnType>
 <Implementation><![CDATA[
+	Set ..SvgBox = ##class(TECH.Svg.Basis.SvgBox).%New()
+	
 	If (VmlId = "KAD") {
 		Do ..KadFreesRect(Breedte, Lengte, Rotation)	
-	}ElseIf (VmlId ="SD30"){
+	}ElseIf (VmlId ="SD30") {
 		Do ..SD30FREES(Breedte, Lengte, Rotation)
-	}ElseIf (VmlId ="SD35"){
+	}ElseIf (VmlId ="SD35") {
 		Do ..SD35FREES(Breedte, Lengte, Rotation)
-	}ElseIf (VmlId ="REGULA_SM"){
+	}ElseIf (VmlId ="REGULA_SM") {
 		Do ..SD35FREES(Breedte, Lengte, Rotation)
-	}ElseIf (VmlId ="KADBM"){
+	}ElseIf (VmlId ="KADBM") {
 		Do ..KADBMFREES(Breedte, Lengte, Rotation)
-	}ElseIf (VmlId ="KADHS"){
+	}ElseIf (VmlId ="KADHS") {
 		Do ..KadHSFreesRect(Breedte, Lengte, Rotation, YPos)
-	}ElseIf (VmlId ="KAD120"){
+	}ElseIf (VmlId ="KAD120") {
 		Do ..KadHSFreesRect(Breedte, Lengte, Rotation)
-	}ElseIf (VmlId ="KADFER"){
-		Do ..KadFreesRect(Breedte, Lengte, Rotation, 16 ,22)
+	}ElseIf (VmlId ="KADFER") {
+		Do ..KadFreesRect(Breedte, Lengte, Rotation, 16 , 22)
 	}
+	
 	Quit ..SvgBox
 ]]></Implementation>
 </Method>
@@ -74,8 +77,8 @@
 	#dim Path As TECH.Svg.Basis.Path = ..BasisElementFactory.MaakPathHalveCirkel(CoordinatesList)
 	Do Path.SetFill(##class(TECH.Svg.enu.Kleur).Blauw())
 	Do Path.SetStroke(##class(TECH.Svg.enu.Kleur).Blauw())
-	Do ..SvgBox.VoegToeElement(Path)
 	
+	Do ..SvgBox.VoegToeElement(Path)
 	Quit ..SvgBox
 ]]></Implementation>
 </Method>
@@ -126,7 +129,8 @@
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer,YPos:%Integer</FormalSpec>
 <Implementation><![CDATA[
 	Set ElementToevoeger = ##class(TECH.Svg.Basis.SvgBox.ElementToevoeger).%New()
-	Do ..KadFreesRect(Breedte, 23+ YPos, Rotation, 2, 46)
+	
+	Do ..KadFreesRect(Breedte, 23 + YPos, Rotation, 2, 46)
 	Do ..KadFreesRect(Breedte, 11 + YPos, Rotation, 16, 22)
 ]]></Implementation>
 </Method>
@@ -135,8 +139,8 @@
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer,FreesB:%Integer=16,FreesL:%Integer=14</FormalSpec>
 <Implementation><![CDATA[
 	Set ElementToevoeger = ##class(TECH.Svg.Basis.SvgBox.ElementToevoeger).%New()
-	#dim Rechthoek As TECH.Svg.Basis.Rect
 	
+	#dim Rechthoek As TECH.Svg.Basis.Rect
 	If (Rotation = 0) {
 		Set Rechthoek = ..BasisElementFactory.MaakRechthoek(Breedte-FreesB, Lengte-FreesL, FreesB, FreesL)
 	}
@@ -150,6 +154,7 @@
 		Set Rechthoek = ..BasisElementFactory.MaakRechthoek(0, Breedte - FreesL, FreesB, FreesL)
 	}
 	Do Rechthoek.SetFill(##class(TECH.Svg.enu.Kleur).Blauw())
+	
 	Do ElementToevoeger.VoegToeElement(..SvgBox, Rechthoek)
 ]]></Implementation>
 </Method>