CWS-TOOLING: integrate CWS automationdev300m93

6 files changed, 1182 insertions, 1063 deletions

diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
index 29557214638b..1023ab88fd0a 100644
--- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc
+++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
@@ -35,8 +35,9 @@ testcase tiDatei_Fuer_Anordnen_Erstellen
     dim sTemp as string
     dim i as integer
     dim zaehler as integer
-    '/// This function creates the document, that will be used as reference and working object inthe following cases :-) ///'
-    '///'Dim Datei ' somewhere global :-) defined in calling sub! :sub im_107c_ ///
+    printlog "This function creates the document, that will be used as reference and working object inthe following cases :-)"
+    'Dim Datei ' somewhere global :-) defined in calling sub! :sub im_107c_
+    printlog "new document "
     call hNewDocument
     if gApplication = "DRAW" then
         kontext "DocumentDraw"
@@ -49,22 +50,27 @@ testcase tiDatei_Fuer_Anordnen_Erstellen
     hMenuSelectNr(4)
     hMenuSelectNr(13)
     call sSelectEmptyLayout								'/// new document  ///'
-   if Dir(Datei)<>"" then app.Kill(Datei) ' kill old file
-   for Zaehler = 1 to 3									'/// create 3 overlapping objects  ///'
+    if Dir(Datei)<>"" then app.Kill(Datei) ' kill old file
+    printlog "create 3 overlapping objects "
+    for Zaehler = 1 to 3
     Kontext
     Select Case Zaehler
         Case 1:	WL_SD_Wuerfel
-            gMouseMove (20,5, 80,60) '/// cubicel 20,5, 80,60 ///
+            printlog "cubicel 20,5, 80,60"
+            gMouseMove (20,5, 80,60) 
             Printlog " Object start ---------------------- "+ Zaehler +" cubicel "
         Case 2:	WL_SD_RechteckVoll
-            gMouseMove (40,35, 90,90) '/// rectangel 40,35, 90,90 ///
-            Printlog " Object start ---------------------- "+ Zaehler +" rectangel "
+            printlog "rectangel 40,35, 90,90"
+            gMouseMove (40,35, 90,90) 
+           Printlog " Object start ---------------------- "+ Zaehler +" rectangel "
         Case 3: WL_SD_Torus
-            gMouseMove (1,35, 60,95) '/// donut ;-) 1,35, 60,95 ///
+            printlog "donut 1,35, 60,95 "
+            gMouseMove (1,35, 60,95) 
             Printlog " Object start ---------------------- "+ Zaehler +" donut "
     End Select
       sleep (1)
-      FormatArea										'/// assign different area properties for created objects (use rnd function)///'
+      printlog "assign different area properties for created objects (use rnd function)"
+      FormatArea										
       sleep (1)
       kontext
     Select Case Zaehler
@@ -85,12 +91,13 @@ testcase tiDatei_Fuer_Anordnen_Erstellen
                     TabFarben.OK
     End Select
     sleep 1
-    ContextPositionAndSize							'/// save position and size values into varialbes  ///'
+    printlog "save position and size values into varialbes "
+    ContextPositionAndSize							
     sleep (1)
     kontext
     active.SetPage TabPositionAndSize
     kontext "TabPositionAndSize"
-    '/// the variables : Ueber_Text_[1-3] get set here ! with x position of object///
+    printlog "the variables : Ueber_Text_[1-3] get set here ! with x position of object"
         Select Case Zaehler
             Case 1:	Ueber_Text_1 = PositionX.GetText : printlog "xpos: "+zaehler+": "+PositionX.GetText
             Case 2:	Ueber_Text_2 = PositionX.GetText : printlog "xpos: "+zaehler+": "+PositionX.GetText
@@ -100,41 +107,43 @@ testcase tiDatei_Fuer_Anordnen_Erstellen
       gMouseClick 96,5
    next Zaehler
    sleep 1
-   call hFileSaveAsKill (Datei)							'/// save document  ///'
+   printlog "save document "
+   call hFileSaveAsKill (Datei)							
    printlog "OK   saved at ", Datei
    sleep 1
-   '/// select in default order and take Position X in mind ;-) ///'
-   '///+ has to be from bottom to top: cubicel, rectangel, donut ///'
+   printlog "select in default order and take Position X in mind ;-)"
+   printlog "+ has to be from bottom to top: cubicel, rectangel, donut"
     sPrintCheckOrder (TRUE)
-    call hCloseDocument									'/// close document  ///'
+    printlog "close document "
+    call hCloseDocument									
     
 endcase 'tiDatei_Fuer_Anordnen_Erstellen
 '-------------------------------------------------------------------------------
 testcase tdContextSendBackward
 
    dim sTemp as string
-   '/// open created document 'with 3 figures' ///'
+   printlog "open created document 'with 3 figures'"
    if (hFileOpen (Datei)) then
       sleep 10
      sPrintCheckOrder (TRUE)
-      '/// select the middle object: rectangle, with keys: [TAB],[TAB] ///'
+      printlog "select the middle object: rectangle, with keys: [TAB],[TAB]"
       hTypeKeys ("<TAB><TAB>")
-      '/// Send Backward / [Strg]+[-] -> one level more to the back ///'
+      printlog "Send Backward / [Strg]+[-] -> one level more to the back"
       WL_TB_ANORDNUNG_WeiterNachHinten
-      '///+ has to be from bottom to top: rectangel cubicel donut ///'
+      printlog "+ has to be from bottom to top: rectangel cubicel donut"
       sleep 2
      sPrintCheckOrder
-      '/// deselect all ///'
+      printlog "deselect all"
       hTypeKeys ("<escape><escape>")
       sleep 2
-      '/// select the middle object: cubical, with keys: [TAB],[TAB] ///'
+      printlog "select the middle object: cubical, with keys: [TAB],[TAB]"
       hTypeKeys ("<TAB><TAB>")
       sleep 2
       sTemp = fGetPositionX
       if sTemp <> Ueber_Text_1 then
           warnlog "Arrangement is wrong; is: "+sTemp+"; should: "+Ueber_Text_1+";"
       end if
-      '/// close document ///'
+      printlog "close document"
       Call hCloseDocument
    endif
    sleep 2
@@ -144,18 +153,18 @@ endcase 'tdContextSendBackward
 testcase tdContextBringForward
 
    dim sTemp as string
-   '/// open created document 'with 3 figures' ///'
+   printlog "open created document 'with 3 figures'"
    if (hFileOpen (Datei)) then
       sleep 10
      sPrintCheckOrder (TRUE)
-      '/// select the middle object: rectangle, with keys: [TAB],[TAB] ///'
+      printlog "select the middle object: rectangle, with keys: [TAB],[TAB]"
       hTypeKeys ("<TAB><TAB>")
-      '/// Bring Forward / [Strg]+[+] -> one level more to the front ///'
+      printlog "Bring Forward / [Strg]+[+] -> one level more to the front"
       WL_TB_ANORDNUNG_WeiterNachVorn
-      '/// has to be from bottom to top: cubicel donut rectangel ///'
+      printlog "has to be from bottom to top: cubicel donut rectangel"
       sleep 1
      sPrintCheckOrder
-      '/// select the middle object: donut, with keys: [TAB],[TAB] ///'
+      printlog "select the middle object: donut, with keys: [TAB],[TAB]"
       hTypeKeys ("<TAB><TAB>")
       sleep 2
       sTemp = fGetPositionX
@@ -163,7 +172,7 @@ testcase tdContextBringForward
           warnlog "Arrangement is wrong; is: "+sTemp+"; should: "+Ueber_Text_3+";"
       end if
       sleep 1
-      '/// close document ///'
+      printlog "close document"
       Call hCloseDocument
    endif
    
@@ -172,18 +181,18 @@ endcase 'tdContextBringForward
 testcase tdContextSendToBack
 
    dim sTemp as string
-   '/// open created document 'with 3 figures' ///'
+   printlog "open created document 'with 3 figures'"
    if (hFileOpen (Datei)) then
       sleep 10
      sPrintCheckOrder (TRUE)
-      '/// select the top object: donut, with keys: [TAB],[TAB],[TAB] ///'
+      printlog "select the top object: donut, with keys: [TAB],[TAB],[TAB]"
       hTypeKeys ("<TAB><TAB><TAB>")
-      '/// Send to Back / [Strg]+[Shift]+[-] -> backmost object ///'
+      printlog "Send to Back / [Strg]+[Shift]+[-] -> backmost object"
       OL_DRAW_GanzNachHinten
-      '/// has to be from bottom to top: rectangel cubicel donut ///'
+      printlog "has to be from bottom to top: rectangel cubicel donut"
       sleep 3
      sPrintCheckOrder
-      '/// select the middle object: cubical, with keys: [TAB],[TAB] ///'
+      printlog "select the middle object: cubical, with keys: [TAB],[TAB]"
       hTypeKeys ("<TAB><TAB>")
       sleep 1
       sTemp = fGetPositionX
@@ -191,7 +200,7 @@ testcase tdContextSendToBack
           warnlog "Arrangement is wrong; is: "+sTemp+"; should: "+Ueber_Text_1+";"
       end if
       sleep 3
-      '/// close document ///'
+      printlog "close document"
      Call hCloseDocument
    endif
    
@@ -200,17 +209,17 @@ endcase 'tdContextSendToBack
 testcase tdContextBringToFront
 
    dim sTemp as string
-   '/// open created document 'with 3 figures' ///'
+   printlog "open created document 'with 3 figures'"
    if (hFileOpen (Datei)) then
       sleep 10
      sPrintCheckOrder (TRUE)
-      '/// select the bottom object: cubical, with keys: [TAB] ///'
+      printlog "select the bottom object: cubical, with keys: [TAB]"
       hTypeKeys ("<TAB>")
-      '/// Bring to Front / [Strg]+[Shift]+[+] -> frontmost object ///'
+      printlog "Bring to Front / [Strg]+[Shift]+[+] -> frontmost object"
       OL_DRAW_GanzNachVorn
-      '/// has to be from bottom to top: rectangel, donut, cubicel ///'
+      printlog "has to be from bottom to top: rectangel, donut, cubicel"
      sPrintCheckOrder
-      '/// select the middle object: donut, with keys: [TAB],[TAB] ///'
+      printlog "select the middle object: donut, with keys: [TAB],[TAB]"
       hTypeKeys ("<TAB><TAB>")
       sleep 1
       sTemp = fGetPositionX
@@ -218,7 +227,7 @@ testcase tdContextBringToFront
           warnlog "Arrangement is wrong; is: "+sTemp+"; should: "+Ueber_Text_3+";"
       end if
       sleep 3
-      '/// close document ///'
+      printlog "close document"
      Call hCloseDocument
    endif
    
@@ -227,26 +236,26 @@ endcase 'tdContextBringToFront
 testcase tdContextInFrontOfObject
 
    dim sTemp as string
-   '/// open created document 'with 3 figures' ///'
+   printlog "open created document 'with 3 figures'"
    if (hFileOpen (Datei)) then
       sleep 10
      sPrintCheckOrder (TRUE)
-      '/// select the top object: donut, with keys: [TAB],[TAB],[TAB] ///'
+      printlog "select the top object: donut, with keys: [TAB],[TAB],[TAB]"
       hTypeKeys ("<TAB><TAB><TAB>")
-      '/// In Front of object ///'
+      printlog "In Front of object"
       OL_DRAW_VorDasObjekt
-      '/// left click the cubicel with the mouse ///'
+      printlog "left click the cubicel with the mouse"
       gMouseClick 50,5
-      '/// has to be from bottom to top: cubicel, donut, rectangel ///'
+      printlog "has to be from bottom to top: cubicel, donut, rectangel"
      sPrintCheckOrder
       sleep 1
-      '/// select the middle object: donut, with keys: [TAB],[TAB] ///'
+      printlog "select the middle object: donut, with keys: [TAB],[TAB]"
       hTypeKeys ("<TAB><TAB>")
       sTemp = fGetPositionX
       if sTemp <> Ueber_Text_3 then
           printlog "DISABLED the WARNLOG, because mouseaction is not always the same :-( : Arrangement is wrong; is: "+sTemp+"; should: "+Ueber_Text_3+";"
       end if
-      '/// close document ///'
+      printlog "close document"
       Call hCloseDocument
    endif
    
@@ -255,27 +264,27 @@ endcase 'tdContextInFrontOfObject
 testcase tdContextBehindObject
 
    dim sTemp as string
-   '/// open created document 'with 3 figures' ///'
+   printlog "open created document 'with 3 figures'"
    if (hFileOpen (Datei)) then
       sleep 10
      sPrintCheckOrder (TRUE)
-      '/// select the top object: donut, with keys: [TAB],[TAB],[TAB] ///'
+      printlog "select the top object: donut, with keys: [TAB],[TAB],[TAB]"
       hTypeKeys ("<TAB><TAB><TAB>")
-      '/// Behind object ///'
+      printlog "Behind object"
       OL_DRAW_HinterDasObjekt
       sleep 1
-      '/// left click the cubicel with the mouse ///'
+      printlog "left click the cubicel with the mouse"
       gMouseClick 50,5
-      '/// has to be from bottom to top: donut, cubicel, rectangel ///'
+      printlog "has to be from bottom to top: donut, cubicel, rectangel"
      sPrintCheckOrder
       sleep 1
-      '/// select the bottom object: donut, with keys: [TAB] ///'
+      printlog "select the bottom object: donut, with keys: [TAB]"
       hTypeKeys ("<TAB>")
       sTemp = fGetPositionX
       if sTemp <> Ueber_Text_3 then
           printlog "DISABLED the WARNLOG, because mouseaction is not always tthe same  Arrangement is wrong; is: "+sTemp+"; should: "+Ueber_Text_3+";"
       end if
-      '/// close document ///'
+      printlog "close document"
       Call hCloseDocument
    endif
    
@@ -286,17 +295,17 @@ testcase tdContextReverse
    dim sTemp as string
    dim sTemp2 as string
    dim i as integer
-   '/// open created document 'with 3 figures' ///'
+   printlog "open created document 'with 3 figures'"
    if (hFileOpen (Datei)) then
       sleep 10
      sPrintCheckOrder (TRUE)
-      '/// Edit->Select All ///'
+      printlog "Edit->Select All"
       EditSelectAll
       sleep 3
-      '/// Reverse ///'
+      printlog "Reverse"
       WL_TB_ANORDNUNG_Vertauschen
      sPrintCheckOrder
-      '/// select in default order and take Position X in mind ;-) ///'
+      printlog "select in default order and take Position X in mind ;-)"
       hTypeKeys ("<escape><escape>")
       for i = 1 to 3
          hTypeKeys ("<TAB>")
@@ -310,10 +319,9 @@ testcase tdContextReverse
             warnlog " - " + i + " Arrangement is wrong; is: "+sTemp+"; should: "+sTemp2+";"
          end if
       next i
-      '/// close document ///'
-      Call hCloseDocument									'/// close document  ///'
+      printlog "close document"
+      Call hCloseDocument									
    endif
    
 endcase 'tdContextReverse
 '-------------------------------------------------------------------------------
-
diff --git a/testautomation/graphics/optional/includes/global/g_convertto.inc b/testautomation/graphics/optional/includes/global/g_convertto.inc
index 33eb157bc465..3a829b1ef275 100644
--- a/testautomation/graphics/optional/includes/global/g_convertto.inc
+++ b/testautomation/graphics/optional/includes/global/g_convertto.inc
@@ -30,15 +30,6 @@
 '* short description :
 '*
 '**************************************************************************************
-' #1 tiAendernUmwandelnInPolygon
-' #1 tiModifyConvertToPolygon
-' #1 tdContextConvertIntoBitmap
-' #1 tiAendernUmwandelnInKurve
-' #1 tiAendernUmwandelnInPolygonGrafik
-' #1 tiAendernUmwandelnIn3D
-' #1 tiAendernUmwandelnIn3DRotationskoerper
-' #1 tiAendernUmwandelnInMetaFile
-'\*************************************************************************************
 
 '  Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\columbia.dxf")
 '   Call hGrafikEinfuegen ConvertPath  ( gTesttoolPath + "global\input\graf_inp\enter.bmp" )
@@ -52,29 +43,29 @@
 '   Call tdContextConvertIntoMetaFile
 
 testcase tiModifyConvertToPolygon
-   Dim PosX as string
-   Dim PosY as string
-   Dim Maxanzahl as string
-   Dim Minanzahl as string
+    Dim PosX as string
+    Dim PosY as string
+    Dim Maxanzahl as string
+    Dim Minanzahl as string
 
-   Call hNewDocument
-   Call sSelectEmptyLayout
-   sleep 3
-   hTextrahmenErstellen ("This is a text that will be transformed into a Polygon-object", 10,10,60,30)
-   sleep 1
-   hTypeKeys "<Escape>"
-   sleep 1
-   EditSelectAll
-   sleep 1
-   ContextConvertIntoPolygon
-   sleep 1
-   ContextPositionAndSize
-      Kontext
-      Active.SetPage TabPositionAndSize
-      Kontext "TabPositionAndSize"
-      PosX = Width.GetText
-      PosY = Height.GetText
-      TabPositionAndSize.OK
+    Call hNewDocument
+    Call sSelectEmptyLayout
+    sleep 3
+    hTextrahmenErstellen ("This is a text that will be transformed into a Polygon-object", 10,10,60,30)
+    sleep 1
+    hTypeKeys "<Escape>"
+    sleep 1
+    EditSelectAll
+    sleep 1
+    ContextConvertIntoPolygon
+    sleep 1
+    ContextPositionAndSize
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    PosX = Width.GetText
+    PosY = Height.GetText
+    TabPositionAndSize.OK
    sleep 1
    FormatCharacter
        Kontext
@@ -120,7 +111,7 @@ testcase tiModifyConvertToPolygon
       Kontext
       Active.SetPage TabPositionAndSize
       Kontext "TabPositionAndSize"
-      '/// compare width and heigth to control is it is still text ///'
+      printlog "compare width and heigth to control is it is still text"
       if ( Width.GetText = PosX or Height.GetText = PosY ) Then
            Printlog "- Text converted into polygon"
       else
@@ -133,7 +124,7 @@ testcase tiModifyConvertToPolygon
 
    Call hNewDocument
    sleep 3
-   '/// insert graphic (input\\impress\\grafik\\sample.bmp)///'
+   printlog "insert graphic (input\\impress\\grafik\\sample.bmp)"
    Call hGrafikEinfuegen ConvertPath  ( gTesttoolPath + "global\input\graf_inp\enter.bmp" )
    sleep 3
    ContextConvertIntoPolygon
@@ -142,9 +133,11 @@ testcase tiModifyConvertToPolygon
        MaxAnzahl = Farbanzahl.GetText
       Farbanzahl.More 1
       If Maxanzahl < Farbanzahl.GetText Then Warnlog "- Maximum value could be raised."
-      Farbanzahl.ToMin									'/// set color to min ///'
+      printlog "set color to min"
+      Farbanzahl.ToMin								
       MinAnzahl = Farbanzahl.GetText
-      Farbanzahl.Less 1									'/// try to set a value lower than minimum ///'
+      printlog "try to set a value lower than minimum"
+      Farbanzahl.Less 1									
       If Farbanzahl.GetText < Minanzahl then Warnlog "- Minimum value could be lowered."
       Farbanzahl.SetText "2"
       Vorschau.Click
@@ -166,18 +159,20 @@ endcase 'tiModifyConvertToPolygon
 '--------------------------------------------------------
 testcase tdContextConvertIntoBitmap
 
-  Call hNewDocument									'/// new document  ///'
-  sleep 3
-  InsertGraphicsFromFile								'/// insert graphic  ///'
-  sleep 3
-  kontext "Active"
+    printlog "new document"
+    Call hNewDocument
+    sleep 3
+    printlog "insert graphic"
+    InsertGraphicsFromFile
+    sleep 3
+    kontext "Active"
     if Active.Exists Then
-       Active.OK
+        Active.OK
     end if
-  sleep 5
-  Kontext "GrafikEinfuegenDlg"
-  sleep 2
-'///  uses input\\impress\\grafik\\columbia.dxf ///
+    sleep 5
+    Kontext "GrafikEinfuegenDlg"
+    sleep 2
+printlog " uses input\impress\grafik\columbia.dxf"
   Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\columbia.dxf")
   sleep 2
   Oeffnen.Click
@@ -192,44 +187,53 @@ testcase tdContextConvertIntoBitmap
    end if
   Kontext "DocumentImpress"
    try
-        ContextConvertIntoBitmap							'/// convert dxf file to bitmap  ///'
+        printlog "convert dxf file to bitmap"
+        ContextConvertIntoBitmap							
         sleep 1
         Printlog "- Convert into bitmap works"
    catch
         Warnlog "- Convert into bitmap does not work"
    endcatch
- sleep 2
-  Call hCloseDocument									 '/// close document  ///'
-  
+    sleep 2
+    printlog "close document"
+    Call hCloseDocument
+
 endcase 'tdContextConvertIntoBitmap
 '--------------------------------------------------------
 testcase tiAendernUmwandelnInKurve
 
     Printlog "  ----- ContextConvertIntoCurve testen"
-
- Call hNewDocument							'/// New impress document///'
+    printlog "New impress document"
+    Call hNewDocument
     Call sSelectEmptyLayout
 
-  Call hTextrahmenErstellen ("I test,test,test,test only, if it works for you",20,20,60,30)	'/// create textbox///'
-   sleep 2
-   Kontext "DocumentImpress"
-   gMouseDoubleClick  70,70					'/// deselect textbox ///'
-   sleep 2
-   EditSelectAll                                                '/// select textbox ///'
-   sleep 2
-   ContextConvertIntoCurve							'/// convert into curve ///'
-   sleep 3
-   gMouseClick 30,15
+    printlog "create textbox"
+    Call hTextrahmenErstellen ("I test,test,test,test only, if it works for you",20,20,60,30)
+    sleep 2
+    Kontext "DocumentImpress"
+    printlog "deselect textbox "
+    gMouseDoubleClick  70,70
+    sleep 2
+    printlog "select textbox "
+    EditSelectAll
+    sleep 2
+    printlog "convert into curve "
+    ContextConvertIntoCurve
+    sleep 3
+    gMouseClick 30,15
 
-    hTypeKeys "<SHIFT RIGHT>",3					'/// try to select 3 letters ///'
+    printlog "try to select 3 letters "
+    hTypeKeys "<SHIFT RIGHT>",3					
      try
-    EditCopy							'/// try edit copy to check if its still text ///'
+     printlog "try edit copy to check if its still text "
+    EditCopy							
         Warnlog "  - Convert into curve, seperate letters should not be selectable anymore"
      catch
         Printlog "  - Text converted into a curve"
      endcatch
 
- Call hCloseDocument								'/// close document ///'
+     printlog "close document "
+    Call hCloseDocument
  
 endcase 'tiAendernUmwandelnInKurve
 '--------------------------------------------------------
@@ -237,13 +241,15 @@ testcase tiAendernUmwandelnInPolygonGrafik
 
     Printlog "- Context/ConvertIntoPolygon"
 
- Call hNewDocument									'/// new document ///'
+    printlog "new document "
+    Call hNewDocument
     Call sSelectEmptyLayout
 
-  InsertGraphicsFromFile								'/// insert graphic (desp.bmp) ///'
+    printlog "insert graphic (desp.bmp) "
+  InsertGraphicsFromFile								
 
   Kontext "GrafikEinfuegenDlg"
-   '///use graphic : input\\impress\\grafik\\desp.bmp ///
+  printlog "use graphic : input\impress\grafik\desp.bmp"
    Dateiname.SetText ConvertPath ( gTesttoolPath + "global\input\graf_inp\desp.bmp" )
    Oeffnen.Click
    sleep 3
@@ -251,53 +257,66 @@ testcase tiAendernUmwandelnInPolygonGrafik
   EditSelectAll
   sleep 1
 
-  ContextConvertIntoPolygon								'///  convert into polygon ///'
+  printlog " convert into polygon "
+  ContextConvertIntoPolygon								
   Kontext "UmwandelnInPolygon"
    Printlog "- Testing vectorize dialog"
-   Farbanzahl.ToMax									'/// set number of colors to max  ///'
+   printlog "set number of colors to max"
+   Farbanzahl.ToMax									
      if Farbanzahl.GetText <> "32" Then Warnlog "- Maximum value for color depth should be 32, but it is: " + Farbanzahl.GetText
-   Farbanzahl.ToMin									'/// set number of colors to min  ///'
+     printlog "set number of colors to min"
+    Farbanzahl.ToMin
    sleep 1
      if Farbanzahl.GetText <> "8" Then Warnlog "- Minimum value for color depth should be 8 but it is: " + Farbanzahl.GetText
    sleep 2
-   Punktreduktion.SetText "50"								'/// set point reduction to 50 ///'
+   printlog "set point reduction to 50 "
+   Punktreduktion.SetText "50"								
    sleep 2
      if Punktreduktion.GetText <> "32 Pixel" Then Warnlog "- Maximum value should be 32, but it is: " + Punktreduktion.GetText
    sleep 1
-   Punktreduktion.SetText "-50"								'/// set an out of range value  ///'
+   printlog "set an out of range value"
+   Punktreduktion.SetText "-50"								
    sleep 1
      if Punktreduktion.GetText <> "0 Pixel" Then Warnlog "- Minimum value should be 0, but it is: " + Punktreduktion.GetText
-   Loecherfuellen.Uncheck								'/// uncheck fill holes  ///'
+     printlog "uncheck fill holes"
+    Loecherfuellen.Uncheck
     if Not Kachelgroesse.IsEnabled Then
        Printlog "- Control disabled."
     else
        Warnlog "- Control should be disabled if Fill is not checked."
     end if
-   Vorschau.Click									'/// open preview  ///'
+    printlog "open preview"
+   Vorschau.Click									
    sleep 2
-   UmwandelnInPolygon.OK								'/// close dialog ///'
+   printlog "close dialog "
+   UmwandelnInPolygon.OK								
    sleep 5
-  Call hCloseDocument									'/// close document  ///'
+   printlog "close document"
+  Call hCloseDocument									
   
 endcase 'tiAendernUmwandelnInPolygonGrafik
 '--------------------------------------------------------
 testcase tiAendernUmwandelnIn3D
 
     Printlog "- Convert into 3D"
- Call hNewDocument
- sleep 1								'/// new impress document ///'
-  hRechteckErstellen (10,10,40,40)							'/// create rectangle  ///'
-                    '/// convert into 3D ///'
+    printlog "new impress document "
+    Call hNewDocument
+    sleep 1
+    printlog "create rectangle"
+    hRechteckErstellen (10,10,40,40)
+                    printlog "convert into 3D "
    sleep 2
    gMouseclick 35,35
    sleep 1
    try
-     ContextConvertInto3D								'/// try to access convert ito 3d a 2nd time, should be impossible using a 3d object as source ///'
+   printlog "try to access convert ito 3d a 2nd time, should be impossible using a 3d object as source "
+     ContextConvertInto3D								
      Printlog "- Convert into 3D works"
    catch
      Warnlog "- Convert into 3D does not work"
    endcatch
- Call hCloseDocument									'/// close document '///
+   printlog "close document"
+ Call hCloseDocument									
  
 endcase 'tiAendernUmwandelnIn3D
 '--------------------------------------------------------
@@ -307,11 +326,14 @@ testcase tiAendernUmwandelnIn3DRotationskoerper
   Dim PosX
   Dim PosY
 
- Call hNewDocument									'/// new document '///
+  printlog "new document"
+ Call hNewDocument									
   Kontext "DocumentImpress"
-  hRechteckErstellen (20,20,50,50)							'/// create rectangle  ///'
+  printlog "create rectangle"
+  hRechteckErstellen (20,20,50,50)							
   sleep 1
-  ContextPositionAndSize								'/// get position values for the rectangle ///'
+  printlog "get position values for the rectangle "
+  ContextPositionAndSize								
   Kontext
   Active.SetPage TabPositionAndSize
   Kontext "TabPositionAndSize"
@@ -320,26 +342,31 @@ testcase tiAendernUmwandelnIn3DRotationskoerper
   TabPositionAndSize.OK
   sleep 1
   Kontext "DocumentImpress"
-  ContextConvertInto3DRotationObject							'/// convert into 3d lathe object  ///'
+  printlog "convert into 3d lathe object"
+  ContextConvertInto3DRotationObject							
   sleep 2
   ContextPositionAndSize
   Kontext
-  Active.SetPage TabPositionAndSize								'/// control changes in position values to confirm convert action  ///'
+  printlog "control changes in position values to confirm convert action"
+  Active.SetPage TabPositionAndSize								
   Kontext "TabPositionAndSize"
    if PositionX.GetText = PosX and PositionY.GetText = PosY Then Warnlog "- No change in position or dimension, converting seemd not to work"
   TabPositionAndSize.OK
   sleep 1
- Call hCloseDocument									'/// close document ///'
+  printlog "close document "
+ Call hCloseDocument									
  
 endcase 'tiAendernUmwandelnIn3DRotationskoerper
 '--------------------------------------------------------
 testcase tiAendernUmwandelnInMetaFile
 
     Printlog "- ConvertIntoMetaFile"
-    
-    Call hNewDocument									'/// new document ///'
+
+    printlog "new document "
+    Call hNewDocument									
     sleep 3
-    InsertGraphicsFromFile								'/// insert graphic  ///'
+    printlog "insert graphic"
+    InsertGraphicsFromFile								
     sleep 1
     kontext "Active"
     sleep 1
@@ -349,21 +376,21 @@ testcase tiAendernUmwandelnInMetaFile
     sleep 1
     Kontext "GrafikEinfuegenDlg"
     sleep 2
-    '///  uses input\\impress\\grafik\\desp.gif") ///
+    printlog " uses input\impress\grafik\desp.gif"
     Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\purzel.gif")
     sleep 2
     Oeffnen.Click
     sleep 5
     Kontext "DocumentImpress"
     try
-        ContextConvertIntoMetafile							'/// convert bitmap into metafile  ///'
+        printlog "convert bitmap into metafile"
+        ContextConvertIntoMetafile
         sleep 2
         Printlog "- Convert into Metafile does work"
     catch
         Warnlog "- Convert into Metafile does not work"
     endcatch
     sleep 2
-    Call hCloseDocument									'/// close document  ///'
-    
-endcase 'tiAendernUmwandelnInMetaFile
-
+    printlog "close document"
+    Call hCloseDocument									
+endcase 'tiAendernUmwandelnInMetaFile
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc
index 28c2e22ed301..1a38090914e6 100644
--- a/testautomation/graphics/optional/includes/global/g_customshapes.inc
+++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc
@@ -38,20 +38,19 @@ testcase tCustomshapes
    dim counter as Integer
    dim MakeInto3Dcounter as Integer
 
-   '/// Create new document ///'
+   printlog "Create new document "
    Call hNewDocument
    Call sSelectEmptyLayout
-     if gApplication = "DRAW" then
+    if gApplication = "DRAW" then
         Kontext "Documentdraw"
-     else '(Impress)
+    else '(Impress)
         Kontext "DocumentImpress"
-     endif
-     kontext "Toolbar"
-     sleep 1
-     printlog "insert a Smiley."
-     '/// From the toolbar: Insert three objects: ///'
-     '/// insert a Smiley. ///'
-     kontext "Toolbar"
+    endif
+    kontext "Toolbar"
+    sleep 1
+    printlog "From the toolbar: Insert three objects: "
+    printlog "1st: insert a Smiley. "
+    kontext "Toolbar"
      if Toolbar.Exists then
         if Toolbar.IsVisible then
            sleep 1
@@ -73,17 +72,15 @@ testcase tCustomshapes
            kontext "SymbolShapes"
 	   SymbolShapes.Close
 
-           '/// Unmark all objects ///'
+           printlog "Unmark all objects "
            hTypeKeys "<ESCAPE>"
 
-           '/// Mark the Smiley ///'
+           printlog "Mark the Smiley "
            hTypeKeys "<TAB>"
 
            printlog "Rename the object to 'First'."
-           '/// Rename the object to 'First' ///"
            hOpenContextMenu
            sleep 2
-           'Choose rename.
            if hMenuFindSelect(27027, true, 15) = false then
               Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
               Call hCloseDocument
@@ -93,11 +90,9 @@ testcase tCustomshapes
            NameField.SetText "First"
            NameDlgObject.OK
 
-           printlog "Set the object -Title/Description to 'SecondTitle' and 'SecondText'"
-           '/// Open the Context-menu and set the description of the object to 'First' ///"
+           printlog "Open the Context-menu and set the description of the object to 'First'"
            hOpenContextMenu
            sleep (2)
-           'Choose "Description"
            if hMenuFindSelect(27033, true, 14) = false then
               Warnlog "Context-Menu-entry `Description` was not found. Therefore the test ends."
               Call hCloseDocument
@@ -115,8 +110,7 @@ testcase tCustomshapes
      endif
      gMouseClick 90, 90
 
-     printlog "Insert a Triangle."
-     '/// Insert a Triangle ///'
+     printlog "2nd: Insert a Triangle "
      kontext "Toolbar"
      if Toolbar.Exists then
         if Toolbar.IsVisible then
@@ -138,16 +132,14 @@ testcase tCustomshapes
 	   BasicShapes.Close
            sleep 1
 
-           '/// Unmark all objects ///'
+           printlog "Unmark all objects "
            hTypeKeys "<ESCAPE>"
-           '/// Mark the Triangle ///'
+           printlog "Mark the Triangle "
            hTypeKeys "<TAB>", 2
 
-           printlog "Rename the object into 'Second'."
-           '/// Rename the object into 'Second'. ///'
+           printlog "Rename the object into 'Second'. "
            hOpenContextMenu
            sleep 2
-           'Choose rename.
            if hMenuFindSelect(27027, true, 15) = false then
               Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
               Call hCloseDocument
@@ -159,11 +151,9 @@ testcase tCustomshapes
            NameField.SetText "Second"
            NameDlgObject.OK
 
-           printlog "Set the object -Title/Description to 'SecondTitle' and 'SecondText'."
-           '/// Open the Context-menu and set the description of the object to 'SecondTitle' and 'SecondText' ///"
+           printlog "Open the Context-menu and set the description of the object to 'SecondTitle' and 'SecondText'"
            hOpenContextMenu
            sleep (2)
-           'Choose "Description"
            if hMenuFindSelect(27033, true, 14) = false then
               Warnlog "Context-Menu-entry `Description` was not found. Therefore the test ends."
               Call hCloseDocument
@@ -181,14 +171,13 @@ testcase tCustomshapes
      endif
      gMouseClick 90, 90
 
-     printlog "Insert Thinking-cloud."
-     '/// Insert Thinking-cloud. ///'
+     printlog "3rd: Insert Thinking-cloud."
      kontext "Toolbar"
      if Toolbar.Exists then
         if Toolbar.IsVisible then
            sleep 1
            try
-              CalloutShapes.TearOff  ' insert Thinking-cloud
+              CalloutShapes.TearOff  
            catch
               warnlog "bug for GH from FHA; .tearoff doesnt tell success"
            endcatch
@@ -206,16 +195,14 @@ testcase tCustomshapes
 	   Callouts.Close
 	   sleep 1
 
-           '/// Unmark all objects ///'
+           printlog "Unmark all objects "
            hTypeKeys "<ESCAPE>"
-           '/// Mark the cloud ///'
+           printlog "Mark the cloud "
            hTypeKeys "<TAB>", 3
 
-           printlog "Rename the object to 'Third'."
-           '/// Rename the object to 'Third'. ///'
+           printlog "Rename the object to 'Third'. "
            hOpenContextMenu
            sleep 2
-           'Choose rename.
            if hMenuFindSelect(27027, true, 15) = false then
               Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
               Call hCloseDocument
@@ -225,11 +212,9 @@ testcase tCustomshapes
            NameField.SetText "Third"
            NameDlgObject.OK
 
-           printlog "Set the object -Title/Description to 'ThirdTitle' and 'ThirdText'."
-           '/// Open the Context-menu and set the description of the object to 'First' ///"
+           printlog "Open the Context-menu and set the description of the object to 'First'"
            hOpenContextMenu
            sleep (2)
-           'Choose "Description"
            if hMenuFindSelect(27033, true, 14) = false then
               Warnlog "Context-Menu-entry `Description` was not found. Therefore the test ends."
               Call hCloseDocument
@@ -247,8 +232,7 @@ testcase tCustomshapes
      endif
      gMouseClick 90, 90
 
-     printlog "Change all objects into 3D."
-     '/// Change all objects into 3D. ///'
+     printlog "Change all objects into 3D. "
      if gApplication = "DRAW" then
         Kontext "Documentdraw"
      else '(Impress)
@@ -294,9 +278,8 @@ testcase tCustomshapes
          hTypeKeys "<ESCAPE>"
      Next MakeInto3Dcounter
 
-     printlog "See if the objects still are Custom Shapes."
-     '/// See if the objects still are Custom Shapes ///'
-     '/// We do so by moving the lower part of the the thinking-cloud. ///'
+     printlog "See if the objects still are Custom Shapes "
+     printlog "We do so by moving the lower part of the the thinking-cloud. "
      gMouseClick 90, 1
      hTypeKeys "<TAB><TAB><TAB>"
 
@@ -313,8 +296,7 @@ testcase tCustomshapes
      gMouseClick 90, 1
      hTypeKeys "<TAB>"
 
-     printlog "Check the name of the selected object (should be 'First')"
-     '/// Check the name of the selected object (should be 'First') ///'
+     printlog "Check the name of the selected object (should be 'First') "
      hOpenContextMenu
      sleep 2
      'Choose rename.
@@ -334,7 +316,6 @@ testcase tCustomshapes
      NameDlgObject.OK
 
      printlog "Open the Context-menu and check if the description of the object is right"
-     '/// Open the Context-menu and check if the description of the object is right ///"
      hOpenContextMenu
      sleep (2)
      'Choose "Description"
@@ -363,10 +344,9 @@ testcase tCustomshapes
 
      gMouseClick 90, 1
      hTypeKeys "<TAB><TAB>"
-     '/// Check the name of the selected object (should be 'Second') ///'
+     printlog "Check the name of the selected object (should be 'Second') "
      hOpenContextMenu
      sleep 2
-     'Choose rename.
      if hMenuFindSelect(27027, true, 15) = false then
         Warnlog "   Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -383,7 +363,6 @@ testcase tCustomshapes
      NameDlgObject.OK
 
      printlog "Open the Context-menu and check if the description of the object is right"
-     '/// Open the Context-menu and check if the description of the object is right ///"
      hOpenContextMenu
      sleep (2)
      'Choose "Description"
@@ -416,7 +395,7 @@ testcase tCustomshapes
 
      gMouseClick 90, 1
      hTypeKeys "<TAB><TAB><TAB>"
-     '/// Check the name of the selected object (should be "Third") ///'
+     printlog "Check the name of the selected object (should be Third) "
      hOpenContextMenu
      sleep 2
      'Choose rename.
@@ -436,7 +415,6 @@ testcase tCustomshapes
      NameDlgObject.OK
 
      printlog "Open the Context-menu and check if the description of the object is right"
-     '/// Open the Context-menu and check if the description of the object is right ///"
      hOpenContextMenu
      sleep (2)
      'Choose "Description"
@@ -468,14 +446,14 @@ testcase tCustomshapes
      endif
 
      printlog "End of test. Close the document."
-     Call hCloseDocument         '/// Close Document ///'
+     Call hCloseDocument         
      
 endcase 'tCustomshapes
 '---------------------------------------------------------
 testcase tFormatPaintbrush
 
    dim counter, ZaehlerVerlauf, j as Integer
-   '/// Hatching ///'
+   printlog "Hatching "
    dim HatchingDistance as string
    dim HatchingAngle as string
    dim HatchingLineType as string
@@ -524,23 +502,24 @@ testcase tFormatPaintbrush
    dim front_value as string
    dim background_value as string
 
-   '/// Create new document ///'
+   printlog "Create new document "
    Call hNewDocument
-      '/// Create a new rectangle ///'
+      printlog "Create a new rectangle "
       hRechteckErstellen ( 10, 10, 30, 30 )
       FormatArea
-         '/// Switch to Tabpage "Area" ///'
+         printlog "Switch to Tabpage Area "
          Kontext
          Active.SetPage TabArea
          Kontext "TabArea"
          sleep 1
-         FillOptions.Select 4          '/// Select hatching, control after closing and reopening dialog if changes are recognized ///'
-         '/// Switch to Tabpage "Hatching" ///'
+         printlog "Select hatching, control after closing and reopening dialog if changes are recognized "
+         FillOptions.Select 4          
+         printlog "Switch to Tabpage Hatching "
          Kontext
          Active.setpage TabSchraffuren
          Kontext "TabSchraffuren"
 
-         '/// Get the values for the Rectangle ///'
+         printlog "Get the values for the Rectangle "
          HatchingDistance = Abstand.GetText
          HatchingAngle = Winkel.GetText
          'Definition
@@ -551,7 +530,7 @@ testcase tFormatPaintbrush
          sleep 1
 
 '         FormatArea
-         '/// Switch to Tabpage "Shaddow" ///'
+         printlog "Switch to Tabpage Shaddow "
          Kontext
          Active.setpage TabSchatten
          Kontext "TabSchatten"
@@ -565,7 +544,7 @@ testcase tFormatPaintbrush
          endif
          sleep 1
 
-         '/// Switch to Tabpage "Transparency" ///'
+         printlog "Switch to Tabpage Transparency "
          Kontext
          Active.SetPage TabTransparenz
          Kontext "TabTransparenz"
@@ -583,7 +562,7 @@ testcase tFormatPaintbrush
          MFEnd_value = MFEndwert.GetText
 
          sleep 1
-         '/// Switch to Tabpage "Color" ///'
+         printlog "Switch to Tabpage Color "
          Kontext
          Active.setpage TabFarben
          Kontext "TabFarben"
@@ -603,7 +582,7 @@ testcase tFormatPaintbrush
          endif
          sleep 1
 
-         '/// Switch to Tabpage "Gradient" ///'
+         printlog "Switch to Tabpage Gradient "
          Kontext
          Active.setpage TabFarbverlaeufe
          Kontext "TabFarbverlaeufe"
@@ -619,7 +598,7 @@ testcase tFormatPaintbrush
          tovalue_value = BisWert.GetText
          sleep 1
 
-         '/// Switch to Tabpage "Bitmap" ///'
+         printlog "Switch to Tabpage Bitmap "
          Kontext
          Active.setpage TabBitmap
          Kontext "TabBitmap"
@@ -627,11 +606,11 @@ testcase tFormatPaintbrush
          front_value = Vordergrund.GetSelText
          background_value = Hintergrund.GetSelText
          sleep 1
-      '/// Close the FormatArea-dialogue with "OK" ///'
+      printlog "Close the FormatArea-dialogue with OK "
       TabBitmap.OK
       sleep 2
 
-      '/// Create a second rectangle, and use the "Paintbrush-icon" to copy the settings for the first rectangle onto the new one ///'
+      printlog "Create a second rectangle, and use the Paintbrush-icon to copy the settings for the first rectangle onto the new one "
       hRechteckErstellen ( 70, 70, 90, 90 )
       if gApplication = "DRAW" then
          kontext "Documentdraw"
@@ -659,21 +638,23 @@ testcase tFormatPaintbrush
          sleep 1
       endif
 
-      '/// Check if the Formatting is like the first one. ///'
+      printlog "Check if the Formatting is like the first one. "
       FormatArea
-         '/// Switch to Tabpage "Area" ///'
+         printlog "Switch to Tabpage Area "
          Kontext
          Active.SetPage TabArea
          Kontext "TabArea"
-'         if FillOptions.GetSelIndex <> 4 then        '/// The selected value should be 'no fill' ///'
+'         if FillOptions.GetSelIndex <> 4 then        printlog "The selected value should be 'no fill' "
 '            warnlog "The FillOptions-value was not transferred correctly."
 '         else
 '            printlog "The FillOptions-value was transferred correctly."
 '         endif
 
-            sleep 1                      '/// control if changes are still there after closing and reopening dialog ///'
-            FillOptions.Select 4         '/// Select hatching, control after closing and reopening dialog if changes are recognized ///'
-            '/// Switch to Tabpage "Hatching" ///'
+            sleep 1
+            printlog "control if changes are still there after closing and reopening dialog "
+            FillOptions.Select 4
+            printlog "Select hatching, control after closing and reopening dialog if changes are recognized "
+            printlog "Switch to Tabpage Hatching "
             kontext
             Active.setpage TabSchraffuren
             kontext "TabSchraffuren"
@@ -693,7 +674,7 @@ testcase tFormatPaintbrush
             endif
             sleep 1
 
-         '/// Switch to Tabpage "Shaddow" ///'
+         printlog "Switch to Tabpage Shaddow "
          Kontext
          Active.setpage TabSchatten
          Kontext "TabSchatten"
@@ -718,7 +699,7 @@ testcase tFormatPaintbrush
             endif
             sleep 1
 
-         '/// Switch to Tabpage "Transparency" ///'
+         printlog "Switch to Tabpage Transparency "
          Kontext
          Active.SetPage TabTransparenz
          Kontext "TabTransparenz"
@@ -757,7 +738,7 @@ testcase tFormatPaintbrush
             endif
             sleep 1
 
-         '/// Switch to Tabpage "Color" ///'
+         printlog "Switch to Tabpage Color "
          Kontext
          Active.setpage TabFarben
          Kontext "TabFarben"
@@ -798,7 +779,7 @@ testcase tFormatPaintbrush
             endif
             sleep 1
 
-         '/// Switch to Tabpage "Gradient" ///'
+         printlog "Switch to Tabpage Gradient "
          Kontext
          Active.setpage TabFarbverlaeufe
          Kontext "TabFarbverlaeufe"
@@ -831,7 +812,7 @@ testcase tFormatPaintbrush
             endif
             sleep 1
 
-         '/// Switch to Tabpage "Bitmap" ///'
+         printlog "Switch to Tabpage Bitmap "
          Kontext
          Active.setpage TabBitmap
          Kontext "TabBitmap"
@@ -843,6 +824,7 @@ testcase tFormatPaintbrush
             endif
             sleep 1
       TabBitmap.OK
-   Call hCloseDocument         '/// Close Document ///'
+      printlog "Close Document "
+   Call hCloseDocument         
    
 endcase 'tFormatPaintbrush
diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc
index dbd8d6fe8a43..edd57185e73b 100644
--- a/testautomation/graphics/optional/includes/global/g_format.inc
+++ b/testautomation/graphics/optional/includes/global/g_format.inc
@@ -46,267 +46,265 @@ testcase tiFormatText
     Dim ZaehlerEffekt
     dim sTemp as string
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     Call sSelectEmptyLayout
-    '/// create a textbox with text ///'
-    Call hTextrahmenErstellen ("This is a text, which, I hope, in Staroffice, will be automaticly formatted. Should that not be the case, then it doesn't matter.",20,20,70,20)
+    printlog "create a textbox with text"
+    Call hTextrahmenErstellen ("This is a text, which, I hope, in Openoffice, will be automaticly formatted. Should that not be the case, then it doesn't matter.",20,20,70,20)
     WaitSlot (1000)
-    '/// click outside of textbox, to leave edit mode of textbox and deselect it ///'
+    printlog "click outside of textbox, to leave edit mode of textbox and deselect it"
     gMouseClick 99,99
-    '/// type key [TAB] to select textbox again ///'
+    printlog "type key [TAB] to select textbox again"
     hTypeKeys "<TAB>"
 
-    '/// Format->Position and Size ///'
+    printlog "Format->Position and Size"
     FormatPositionAndSize
-        Kontext
-        '/// select tabpage 'Format and Size' on dialog 'Position and Size' ///'
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        sleep 2
-        '/// get and remember Position: 'Position X' ///'
-        a = PositionX.GetText
-        '/// close dialog 'Position and Size' with OK ///'
-        TabPositionAndSize.OK
+    Kontext
+    printlog "select tabpage 'Format and Size' on dialog 'Position and Size'"
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    sleep 2
+    printlog "get and remember Position: 'Position X'"
+    a = PositionX.GetText
+    printlog "close dialog 'Position and Size' with OK"
+    TabPositionAndSize.OK
 
-    '/// Format -> Text... ///'
+    printlog "Format -> Text..."
     FormatTextDraw
-        Kontext
-        '/// select tabpage 'Text' ///'
-        Active.SetPage TabText
-        Kontext "TabText"
-        '/// Check checkbox 'Fit width to text' ///'
-        BreiteAnTextAnpassen.Check
-        '/// leave dialog with OK ///'
-        TabText.OK
+    Kontext
+    printlog "select tabpage 'Text'"
+    Active.SetPage TabText
+    Kontext "TabText"
+    printlog "Check checkbox 'Fit width to text'"
+    BreiteAnTextAnpassen.Check
+    printlog "leave dialog with OK"
+    TabText.OK
+    printlog "Dialog should have been resized and moved now!"
 
-    '/// Dialog should have been resized and moved now! ///'
-
-    '/// Format->Position and Size ///'
+    printlog "Format->Position and Size"
     ContextPositionAndSize
-        Kontext
-        '/// select tabpage 'Format and Size' on dialog 'Position and Size' ///'
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        WaitSlot (2000)
-        '/// compare 'Position X' with saved value - has to be different ///'
-        sTemp = PositionX.GetText
-        if (sTemp <> a)  Then
-            Printlog "  - Fit to frame does work"
-        else
-            warnlog "  - Fit to frame doesn't work: expected: '" + a + "' is: '" +  + "'"
-        end if
-        '/// get and remember Position: 'Position Y' ///'
-        b=PositionY.GetText
-        TabPositionAndSize.OK
+    Kontext
+    printlog "select tabpage 'Format and Size' on dialog 'Position and Size'"
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    WaitSlot (2000)
+    printlog "compare 'Position X' with saved value - has to be different"
+    sTemp = PositionX.GetText
+    if (sTemp <> a)  Then
+        Printlog "  - Fit to frame does work"
+    else
+        warnlog "  - Fit to frame doesn't work: expected: '" + a + "' is: '" +  + "'"
+    end if
+    printlog "get and remember Position: 'Position Y'"
+    b=PositionY.GetText
+    TabPositionAndSize.OK
 
-    '/// Format -> Text... ///'
+    printlog "Format -> Text..."
     FormatTextDraw
-        Kontext
-        '/// select tabpage 'Text' ///'
-        Active.SetPage TabText
-        Kontext "TabText"
-        '/// UNCheck checkbox 'Fit width to text' ///'
-        BreiteAnTextAnpassen.Uncheck
-        '/// check checkbox 'Fit height to text' ///'
-        HoeheAnTextAnpassen.Check
-        '/// if checkbox 'Fit to frame' is enabled: this state only happens, if 'Fit height to text' and 'Fit width to text' are checked ///'
-        if AmRahmenAnpassen.IsEnabled Then
-            WarnLog "  - checkbox 'Fit to frame' is enabled, which is wrong!"
-        else
-            PrintLog "  - checkbox 'Fit to frame' is disabled."
-        end if
-        WaitSlot (1000)
-        '/// UNcheck checkbox 'Fit height to text' ///'
-        HoeheAnTextAnpassen.UnCheck
-        '/// UNCheck checkbox 'Fit width to text' ///'
-        BreiteAnTextAnpassen.UnCheck
-        '/// if checkbox 'Fit to frame' is disabled: this state only happens, if 'Fit height to text' and/or 'Fit width to text' are checked ///'
-        if AmRahmenAnpassen.IsEnabled Then
-            PrintLog "  - checkbox 'Fit to frame' is enabled."
-        else
-            WarnLog "  - checkbox 'Fit to frame' is disabled, which is wrong!"
-        end if
-'        PrintLog "Full width: " + GanzeBreite.IsChecked
-        '/// set metric field 'Left' to 10 ///'
-        Links.SetText "10"
-        '/// set metric field 'Right' to 10 ///'
-        Rechts.SetText "10"
-        '/// set metric field 'Top' to 10 ///'
-        Oben.SetText "10"
-        '/// set metric field 'Bottom' to 10 ///'
-        Unten.SetText "10"
-        '/// leave dialog with OK ///'
-        TabText.OK
+    Kontext
+    printlog "select tabpage 'Text'"
+    Active.SetPage TabText
+    Kontext "TabText"
+    printlog "UNCheck checkbox 'Fit width to text'"
+    BreiteAnTextAnpassen.Uncheck
+    printlog "check checkbox 'Fit height to text'"
+    HoeheAnTextAnpassen.Check
+    printlog "if checkbox 'Fit to frame' is enabled: this state only happens, if 'Fit height to text' and 'Fit width to text' are checked"
+    if AmRahmenAnpassen.IsEnabled Then
+        WarnLog "  - checkbox 'Fit to frame' is enabled, which is wrong!"
+    else
+        PrintLog "  - checkbox 'Fit to frame' is disabled."
+    end if
+    WaitSlot (1000)
+    printlog "UNcheck checkbox 'Fit height to text'"
+    HoeheAnTextAnpassen.UnCheck
+    printlog "UNCheck checkbox 'Fit width to text'"
+    BreiteAnTextAnpassen.UnCheck
+    printlog "if checkbox 'Fit to frame' is disabled: this state only happens, if 'Fit height to text' and/or 'Fit width to text' are checked"
+    if AmRahmenAnpassen.IsEnabled Then
+        PrintLog "  - checkbox 'Fit to frame' is enabled."
+    else
+        WarnLog "  - checkbox 'Fit to frame' is disabled, which is wrong!"
+    end if
+    printlog "set metric field 'Left' to 10"
+    Links.SetText "10"
+    printlog "set metric field 'Right' to 10"
+    Rechts.SetText "10"
+    printlog "set metric field 'Top' to 10"
+    Oben.SetText "10"
+    printlog "set metric field 'Bottom' to 10"
+    Unten.SetText "10"
+    printlog "leave dialog with OK"
+    TabText.OK
 
-    '/// Edit -> Select All ///'
+    printlog "Edit -> Select All"
     EditSelectAll
-    '/// type Keys [Strg]+[x] to cut object ///'
+    printlog "type Keys [Strg]+[x] to cut object"
     hTypeKeys "<MOD1 X>"
-    '/// No object exists in dokument right now! ///'
-    '/// Format -> Text... ///'
+    printlog "No object exists in dokument right now!"
+    printlog "Format -> Text..."
     FormatTextDraw
-        Kontext
-        '/// select tabpage 'Text' ///'
-        Active.SetPage TabText
-        Kontext "TabText"
-        '/// check checkbox 'Adjust to contour' ///'
-        Konturfluss.Check
-        '/// now every other control on the dialog has to get disabled ///'
-        if ((AmRahmenAnpassen.IsEnabled=False) And (Links.IsEnabled=False) And (Rechts.IsEnabled=False) And (Oben.IsEnabled=False) And (Unten.IsEnabled =False)) Then
-            PrintLog "  - Adjust to contour is working"
-        else
-            WarnLog "  - contourflow aktivated doesn't work it's supposed to"
-        end if
-        '/// leave dialog with OK ///'
-        TabText.OK
+    Kontext
+    printlog "select tabpage 'Text'"
+    Active.SetPage TabText
+    Kontext "TabText"
+    printlog "check checkbox 'Adjust to contour'"
+    Konturfluss.Check
+    printlog "now every other control on the dialog has to get disabled"
+    if ((AmRahmenAnpassen.IsEnabled=False) And (Links.IsEnabled=False) And (Rechts.IsEnabled=False) And (Oben.IsEnabled=False) And (Unten.IsEnabled =False)) Then
+        PrintLog "  - Adjust to contour is working"
+    else
+        WarnLog "  - contourflow aktivated doesn't work it's supposed to"
+    end if
+    printlog "leave dialog with OK"
+    TabText.OK
 
-    '/// create a textbox with text ///'
-    Call hTextrahmenErstellen ("blablablablablablablablablablablabla",20,20,60,60)
+    printlog "create a textbox with text"
+    Call hTextrahmenErstellen ("Just some test-text...",20,20,60,60)
     WaitSlot (5000)
-    '/// Format -> Text... ///'
+    printlog "Format -> Text..."
     FormatTextDraw
-        Kontext
-        '/// select tabpage 'Text Animation' ///'
-        Active.SetPage TabLauftext
-        Kontext "TabLauftext"
+    Kontext
+    printlog "select tabpage 'Text Animation'"
+    Active.SetPage TabLauftext
+    Kontext "TabLauftext"
 
-        ZaehlerEffekt = Effekt.GetItemCount
-        if (ZaehlerEffekt <> 5) then
-            qaerrorlog "There are now more or less than 5 Effects - Change testcase! " + ZaehlerEffekt
+    ZaehlerEffekt = Effekt.GetItemCount
+    if (ZaehlerEffekt <> 5) then
+        qaerrorlog "There are now more or less than 5 Effects - Change testcase! " + ZaehlerEffekt
+    end if
+    for n=1 to ZaehlerEffekt
+        Effekt.Select n
+        printlog n + ": '" + Effekt.getSelText + "' -------------------------------"
+        if (n > 2) then
+            printlog "test all directions"
+            for i = 1 to 4
+                printlog "" + i
+                select case i
+                    case 1: NachOben.click
+                    case 2: NachLinks.click
+                    case 3: NachRechts.click
+                    case 4: NachUnten.click
+                end select
+                sFormatTextDrawAnimation
+            next i
         end if
-        for n=1 to ZaehlerEffekt
-            Effekt.Select n
-            printlog "" + n + ": '" + Effekt.getSelText + "' -------------------------------"
-            if (n > 2) then
-                '/// test all directions ///'
-                for i = 1 to 4
-                    printlog "" + i
-                    select case i
-                        case 1: NachOben.click
-                        case 2: NachLinks.click
-                        case 3: NachRechts.click
-                        case 4: NachUnten.click
-                    end select
-                    sFormatTextDrawAnimation
-                next i
-            end if
-            if ((n > 1) AND (n < 5)) then
-                '/// test all Start/End Text visibility ///'
-                for i = 1 to 4
-                    printlog "" + i
-                    select case i
-                        case 1: TextSichtbarBeimStarten.check : TextSichtbarBeimBeenden.uncheck
-                        case 2: TextSichtbarBeimBeenden.check
-                        case 3: TextSichtbarBeimStarten.uncheck
-                        case 4: TextSichtbarBeimBeenden.uncheck
-                    end select
-                    sFormatTextDrawAnimation
-                next i
-            end if
-            if ((n > 1) AND (n < 5)) then
-                '/// test all Animation cycles ///'
-                for i = 1 to 3
-                    printlog "" + i
-                    select case i
-                        case 1: Endlos.check
-                        case 2: Endlos.UnCheck : Anzahl.typeKeys ("<PageUp>")
-                        case 3: If Endlos.IsChecked = true then
-			           QaErrorLog "#i74067# - Checkbox checked when it shouldn't have been."
-				   Endlos.UnCheck
-				end if
-				Anzahl.setText ("1")
-                    end select
-                    sFormatTextDrawAnimation
-                next i
-            end if
-            if (n > 2) then
-                '/// test all Increment ///'
-                for i = 1 to 4
-                    printlog "" + i
-                    select case i
-                        case 1: Pixel.check : Schrittweite.setText("1")
-                        case 2: printlog "#114551# Loop, if Step greater than object size"
-                        case 3: Pixel.UnCheck : Schrittweite.typeKeys ("<PageDown>")
-                        case 4: printlog "#114551# Loop, if Step greater than object size"
-                    end select
-                    sFormatTextDrawAnimation
-                next i
-            end if
-            if (n > 1) then
-                '/// test all Delay ///'
-                for i = 1 to 3
-                    printlog "" + i
-                    select case i
-                        case 1: Automatisch.check
-                        case 2: Automatisch.UnCheck : Verzoegerung.setText("1")
-                        case 3: Verzoegerung.typeKeys ("<PageUp>")
-                    end select
-                    sFormatTextDrawAnimation
-                next i
-            end if
-        next n
-        TabLauftext.OK
+        if ((n > 1) AND (n < 5)) then
+            printlog "test all Start/End Text visibility"
+            for i = 1 to 4
+                printlog "" + i
+                select case i
+                    case 1: TextSichtbarBeimStarten.check : TextSichtbarBeimBeenden.uncheck
+                    case 2: TextSichtbarBeimBeenden.check
+                    case 3: TextSichtbarBeimStarten.uncheck
+                    case 4: TextSichtbarBeimBeenden.uncheck
+                end select
+                sFormatTextDrawAnimation
+            next i
+        end if
+        if ((n > 1) AND (n < 5)) then
+            printlog "test all Animation cycles"
+            for i = 1 to 3
+                printlog "" + i
+                select case i
+                    case 1: Endlos.check
+                    case 2: Endlos.UnCheck : Anzahl.typeKeys ("<PageUp>")
+                    case 3: If Endlos.IsChecked = true then
+                               QaErrorLog "#i74067# - Checkbox checked when it shouldn't have been."
+                               Endlos.UnCheck
+                            end if
+                            Anzahl.setText ("1")
+                end select
+                sFormatTextDrawAnimation
+            next i
+        end if
+        if (n > 2) then
+            printlog "test all Increment"
+            for i = 1 to 4
+                printlog "" + i
+                select case i
+                    case 1: Pixel.check : Schrittweite.setText("1")
+                    case 2: printlog "#114551# Loop, if Step greater than object size"
+                    case 3: Pixel.UnCheck : Schrittweite.typeKeys ("<PageDown>")
+                    case 4: printlog "#114551# Loop, if Step greater than object size"
+                end select
+                sFormatTextDrawAnimation
+            next i
+        end if
+        if (n > 1) then
+            printlog "test all Delay"
+            for i = 1 to 3
+                printlog "" + i
+                select case i
+                    case 1: Automatisch.check
+                    case 2: Automatisch.UnCheck : Verzoegerung.setText("1")
+                    case 3: Verzoegerung.typeKeys ("<PageUp>")
+                end select
+                sFormatTextDrawAnimation
+            next i
+        end if
+    next n
+    TabLauftext.OK
     Call hCloseDocument
     
 endcase 'tiFormatText
 '-------------------------------------------------------------------------------
 testcase tdFormatLayer
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
 
-    '/// Edit->Layer->Insert (in DRAW also via Insert->Layer) ///'
+    printlog "Edit->Layer->Insert (in DRAW also via Insert->Layer)"
     InsertLayer
-        Kontext "EbeneEinfuegenDlg"
-        EbenenName.SetText " Test 4"
-        LayerTitle.SetText " Test no 4"
-        LayerDescription.SetText " This is the Description of the Layer."
-        EbeneEinfuegenDlg.OK
+    Kontext "EbeneEinfuegenDlg"
+    EbenenName.SetText " Test 4"
+    LayerTitle.SetText " Test no 4"
+    LayerDescription.SetText " This is the Description of the Layer."
+    EbeneEinfuegenDlg.OK
 
-    '/// Edit->Layer->Modify (in DRAW also via Format->Layer)///'
+    printlog "Edit->Layer->Modify (in DRAW also via Format->Layer)"
     FormatLayer
-        Kontext "EbeneAendernDlg"
-        if EbenenName.GetText = " Test 4" Then
-            EbenenName.SetText "Layer 5"
-        end if
-        if LayerTitle.GetText = " Test no 4" Then 
-            LayerTitle.SetText "Layer test 5"
-        end if
-        if LayerDescription.GetText = " This is the Description of the Layer." Then
-            LayerDescription.SetText " This is the changed Description of the Layer."
-        end if
+    Kontext "EbeneAendernDlg"
+    if EbenenName.GetText = " Test 4" Then
+        EbenenName.SetText "Layer 5"
+    end if
+    if LayerTitle.GetText = " Test no 4" Then
+        LayerTitle.SetText "Layer test 5"
+    end if
+    if LayerDescription.GetText = " This is the Description of the Layer." Then
+        LayerDescription.SetText " This is the changed Description of the Layer."
+    end if
 
-        Sichtbar.Check
-        Druckbar.Check
-        Gesperrt.Check
-        EbeneAendernDlg.OK
+    Sichtbar.Check
+    Druckbar.Check
+    Gesperrt.Check
+    EbeneAendernDlg.OK
 
-    '/// Edit->Layer->Modify (in DRAW also via Format->Layer)///'
+    printlog "Edit->Layer->Modify (in DRAW also via Format->Layer)"
     FormatLayer
-        Kontext "EbeneAendernDlg"
-        if EbenenName.GetText <> "Layer 5" Then 
-            WarnLog " Name-Value either didn't change at all, or was empty. Expected: 'Layer 5', but was: " + EbenenName.GetText
-        end if
-        if LayerTitle.GetText <> "Layer test 5" Then 
-            WarnLog " Title-Value either didn't change at all, or was empty. Expected: 'Layer test 5', but was: " + LayerTitle.GetText
-        end if
-        if LayerDescription.GetText <> " This is the changed Description of the Layer." Then
-            WarnLog " Description-Value either didn't change at all, or was empty. Expected: ' This is the changed Description of the Layer.', but was: " + LayerDescription.GetText 
-        end if
-            
-        if Sichtbar.IsChecked=False Then 
-            WarnLog " Value changed: visible"
-        end if
-        if Druckbar.IsChecked=False Then 
-            WarnLog " Value changed: printable"
-        end if
-        if Gesperrt.IsChecked=False then 
-            WarnLog " Value changed: locked"
-        end if
-        EbeneAendernDlg.OK
+    Kontext "EbeneAendernDlg"
+    if EbenenName.GetText <> "Layer 5" Then
+        WarnLog " Name-Value either didn't change at all, or was empty. Expected: 'Layer 5', but was: " + EbenenName.GetText
+    end if
+    if LayerTitle.GetText <> "Layer test 5" Then
+        WarnLog " Title-Value either didn't change at all, or was empty. Expected: 'Layer test 5', but was: " + LayerTitle.GetText
+    end if
+    if LayerDescription.GetText <> " This is the changed Description of the Layer." Then
+        WarnLog " Description-Value either didn't change at all, or was empty. Expected: ' This is the changed Description of the Layer.', but was: " + LayerDescription.GetText
+    end if
 
-    '/// close application ///'
+    if Sichtbar.IsChecked=False Then
+        WarnLog " Value changed: visible"
+    end if
+    if Druckbar.IsChecked=False Then
+        WarnLog " Value changed: printable"
+    end if
+    if Gesperrt.IsChecked=False then
+        WarnLog " Value changed: locked"
+    end if
+    EbeneAendernDlg.OK
+
+    printlog "close application"
     Call hCloseDocument
     
 endcase 'tdFormatLayer
@@ -326,29 +324,29 @@ testcase tdFormatConnector
     end if
 
     Call hNewDocument
-    '/// insert connector ///
-       kontext "Connectorsbar"
-       if Connectorsbar.Exists then
-          Connectorsbar.Close
-       end if
+    printlog "insert connector"
+    kontext "Connectorsbar"
+    if Connectorsbar.Exists then
+        Connectorsbar.Close
+    end if
 
-       kontext "Toolbar"
-       Sleep (1)
-          try
-             Verbinder.TearOff  ' insert connector
-          catch
-             warnlog "bug for GH from TBO; .tearoff doesn't tell success"
-          endcatch
+    kontext "Toolbar"
+    Sleep (1)
+    try
+        Verbinder.TearOff  ' insert connector
+    catch
+        warnlog "bug for GH from TBO; .tearoff doesn't tell success"
+    endcatch
 
     kontext "Connectorsbar"
     Verbinder.click
     gMouseMove ( 10,10,30,30)
 
     Call hCloseDocument
-    '/// Open file with a finished scenario ///'
-        hFileOpen  ConvertPath (gTesttoolPath + "graphics\required\input\FormatConnector." + ExtensionString)
+    printlog "Open file with a finished scenario"
+    hFileOpen  ConvertPath (gTesttoolPath + "graphics\required\input\FormatConnector." + ExtensionString)
     sleep (1)
-    '/// Check if the document is writable ///'
+    printlog "Check if the document is writable"
     if fIsDocumentWritable = false then
         ' Make the document writable and check if it's succesfull
         if fMakeDocumentWritable = false then
@@ -358,83 +356,84 @@ testcase tdFormatConnector
     end if
     gMouseClick 1,1
 
-    '/// Press TAB three times to select the connector. ///'
+    printlog "Press TAB three times to select the connector."
     hTypekeys "<TAB>"
     hTypekeys "<TAB>"
     hTypekeys "<TAB>"
 
     WaitSlot (1000)
-    hTypeKeys "<SHIFT F10>"   'OpenContextMenu(true)
-    sleep (2)
-    hMenuSelectNr(2)  ' Connector
-    sleep (1)
+    printlog "OpenContextMenu(true)"
+    hTypeKeys "<SHIFT F10>"   
+    sleep (3)
+    printlog "Select Connector"
+    hMenuSelectNr(2)  
     Kontext "Verbinder"
-        Typ.Select 2 ' the one with 2 from 3 posibilities to set a value...
+    Typ.Select 2 ' the one with 2 from 3 posibilities to set a value...
    Sleep (1)
-	AnfangHorizontal.SetText "1"
+    AnfangHorizontal.SetText "1"
+    Verbinder.TypeKeys "<TAB>"
+    AnfangVertikal.SetText "1"
+    Verbinder.TypeKeys "<TAB>"
+    EndeHorizontal.SetText "1"
+    Verbinder.TypeKeys "<TAB>"
+    EndeVertikal.SetText "1"
+    Verbinder.TypeKeys "<TAB>"
+    printlog EndeVertikal.getText
+    try
+        Linie1.SetText "10"
         Verbinder.TypeKeys "<TAB>"
-        AnfangVertikal.SetText "1"
+        sTemp = Linie1.getText
+        sUnit = GetMeasUnit(sTemp)
+        cDecSep = GetDecimalSeperator(sTemp)
+    catch
+        PrintLog "  Lineoffset not activated -> you have to choose another linetype: 1"
+    endcatch
+    try
+        Linie2.SetText "10"
         Verbinder.TypeKeys "<TAB>"
-        EndeHorizontal.SetText "1"
+    catch
+        PrintLog "  Lineoffset not activated -> you have to choose another linetype: 2"
+    endcatch
+    try
+        Linie3.SetText "10"
         Verbinder.TypeKeys "<TAB>"
-        EndeVertikal.SetText "1"
-        Verbinder.TypeKeys "<TAB>"
-        printlog EndeVertikal.getText
-        try
-            Linie1.SetText "10"
-            Verbinder.TypeKeys "<TAB>"
-            sTemp = Linie1.getText
-            sUnit = GetMeasUnit(sTemp)
-            cDecSep = GetDecimalSeperator(sTemp)
-        catch
-            PrintLog "  Lineoffset not activated -> you have to choose another linetype: 1"
-        endcatch
-        try
-            Linie2.SetText "10"
-            Verbinder.TypeKeys "<TAB>"
-        catch
-            PrintLog "  Lineoffset not activated -> you have to choose another linetype: 2"
-        endcatch
-        try
-            Linie3.SetText "10"
-            Verbinder.TypeKeys "<TAB>"
-        catch
-            PrintLog "  Lineoffset not activated -> you have to choose another linetype: 3 when will this be enabled ?"
-        endcatch
+    catch
+        PrintLog "  Lineoffset not activated -> you have to choose another linetype: 3 when will this be enabled ?"
+    endcatch
     Verbinder.OK
 
     FormatConnector
-        Kontext "Verbinder"
-        sTemp = AnfangHorizontal.GetText
+    Kontext "Verbinder"
+    sTemp = AnfangHorizontal.GetText
 
-        if fCompareTwoValues(sTemp, "1"+cDecSep+"00"+sUnit) Then
-            WarnLog "  value not changed"
-            printlog "AnfangHorizontal = is '" + sTemp + "' should: '"+"1"+cDecSep+"00"+sUnit+"'"
-        end if
-        if fCompareTwoValues(AnfangVertikal.GetText, "1"+cDecSep+"00"+sUnit) Then
-            WarnLog "  value not changed"
-            printlog "AnfangVertikal.GetText = " + AnfangVertikal.GetText
-        end if
-        if fCompareTwoValues(EndeHorizontal.GetText, "1"+cDecSep+"00"+sUnit) Then
-            WarnLog "  value not changed"
-            printlog "EndeHorizontal.GetText = " + EndeHorizontal.GetText
-        end if
-        if fCompareTwoValues(EndeVertikal.GetText, "1"+cDecSep+"00"+sUnit) Then
-            WarnLog "  value not changed"
-            printlog "EndeHorizontal.GetText = " + EndeHorizontal.GetText
-        end if
+    if fCompareTwoValues(sTemp, "1"+cDecSep+"00"+sUnit) Then
+        WarnLog "  value not changed"
+        printlog "AnfangHorizontal = is '" + sTemp + "' should: '"+"1"+cDecSep+"00"+sUnit+"'"
+    end if
+    if fCompareTwoValues(AnfangVertikal.GetText, "1"+cDecSep+"00"+sUnit) Then
+        WarnLog "  value not changed"
+        printlog "AnfangVertikal.GetText = " + AnfangVertikal.GetText
+    end if
+    if fCompareTwoValues(EndeHorizontal.GetText, "1"+cDecSep+"00"+sUnit) Then
+        WarnLog "  value not changed"
+        printlog "EndeHorizontal.GetText = " + EndeHorizontal.GetText
+    end if
+    if fCompareTwoValues(EndeVertikal.GetText, "1"+cDecSep+"00"+sUnit) Then
+        WarnLog "  value not changed"
+        printlog "EndeHorizontal.GetText = " + EndeHorizontal.GetText
+    end if
 
-        Zaehler = Typ.GetItemCount
-        for i = 1 to Zaehler
-            Typ.Select i
-            SetClipboard Typ.GetSelText
-            Verbinder.OK
-            FormatConnector
-            Kontext "Verbinder"
-            if GetClipboardText <> Typ.GetSelText Then 
-                WarnLog "  Selection not saved. Was: " + Typ.GetSelText + " . But should have been: " +GetClipboardText
-            end if
-        next i
+    Zaehler = Typ.GetItemCount
+    for i = 1 to Zaehler
+        Typ.Select i
+        SetClipboard Typ.GetSelText
+        Verbinder.OK
+        FormatConnector
+        Kontext "Verbinder"
+        if GetClipboardText <> Typ.GetSelText Then
+            WarnLog "  Selection not saved. Was: " + Typ.GetSelText + " . But should have been: " +GetClipboardText
+        end if
+    next i
     Verbinder.OK
     Call hCloseDocument
     
@@ -452,7 +451,6 @@ testcase tiFormatPositionAndSize
 printlog "New impress doc"
     Call hNewDocument                  
     WaitSlot (3000)
-    printlog "RECTANGLE-----1/2"
     printlog "create rectangle"
     Call hRechteckErstellen (20,20,70,30)       
     WaitSlot (1000)
@@ -460,119 +458,119 @@ printlog "New impress doc"
     WaitSlot (1000)
     printlog "Format-position and size"
     ContextPositionAndSize        
-        WaitSlot (1000)
-        Kontext
-        printlog "TabPositionAndSize"
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        printlog "put x and y position into clipboard"
-        printlog "x = " & PositionX.GetText
-        printlog "y = " & PositionY.GetText
-        SetClipboard (PositionX.GetText + PositionY.GetText)
-        TabPositionAndSize.OK
+    WaitSlot (1000)
+    Kontext
+    printlog "TabPositionAndSize"
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    printlog "put x and y position into clipboard"
+    printlog "x = " & PositionX.GetText
+    printlog "y = " & PositionY.GetText
+    SetClipboard (PositionX.GetText + PositionY.GetText)
+    TabPositionAndSize.OK
     WaitSlot (1000)
     printlog "move rectangle down and right"
     hTypeKeys "<DOWN>",10         
     hTypeKeys "<RIGHT>",10
     printlog "open PositionAndSize"
     ContextPositionAndSize
-        WaitSlot (1000)
-        Kontext
-        printlog "TabPositionAndSize"
-        Active.SetPage TabPositionAndSize                
-        Kontext "TabPositionAndSize"
-        printlog "control position changes with clipboard content"
-        if (PositionX.GetText + PositionY.GetText) = GetClipboardText Then WarnLog "Der Dialog hat die Positionsaenderung nicht registriert"          
-        printlog "set position of rectange using the edit fields"
-        PositionX.SetText "2"
-        x=PositionX.GetText
-        PositionY.SetText "2"
-        y=PositionY.GetText
-        printlog "check protect"
-        ProtectPosition.Check
-        TabPositionAndSize.OK
+    WaitSlot (1000)
+    Kontext
+    printlog "TabPositionAndSize"
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    printlog "control position changes with clipboard content"
+    if (PositionX.GetText + PositionY.GetText) = GetClipboardText Then WarnLog "Der Dialog hat die Positionsaenderung nicht registriert"
+    printlog "set position of rectange using the edit fields"
+    PositionX.SetText "2"
+    x=PositionX.GetText
+    PositionY.SetText "2"
+    y=PositionY.GetText
+    printlog "check protect"
+    ProtectPosition.Check
+    TabPositionAndSize.OK
     WaitSlot (1000)
     ContextPositionAndSize
-        WaitSlot (1000)
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        printlog "check if values are correct"
-        if PositionX.GetText = x And PositionY.GetText = y Then PrintLog " Values could be changed"  
-        printlog "check if protect works"
-        if PositionX.GetText<> x Then
-            WarnLog "Protect does not work"
-        else
-            PrintLog "Protext works, X axis checked"
-        end if
-        if PositionY.GetText<> y Then
-            WarnLog "Protect does not work"
-        else
-            PrintLog "  Protext does work, checked y axis"
-        end if
-        printlog "uncheck protect"
-        ProtectPosition.UnCheck
-        TabPositionAndSize.OK
+    WaitSlot (1000)
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    printlog "check if values are correct"
+    if PositionX.GetText = x And PositionY.GetText = y Then PrintLog " Values could be changed"
+    printlog "check if protect works"
+    if PositionX.GetText<> x Then
+        WarnLog "Protect does not work"
+    else
+        PrintLog "Protext works, X axis checked"
+    end if
+    if PositionY.GetText<> y Then
+        WarnLog "Protect does not work"
+    else
+        PrintLog "  Protext does work, checked y axis"
+    end if
+    printlog "uncheck protect"
+    ProtectPosition.UnCheck
+    TabPositionAndSize.OK
     WaitSlot (1000)
     ContextPositionAndSize
-        WaitSlot (1000)
-        Kontext
-        printlog "TabPositionAndSize"
-        WaitSlot (1000)
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        KeepRatio.UnCheck
-        printlog "set width to 10"
-        WaitSlot (1000)
-        Width.SetText "10"
-        printlog "put value into a variable"
-        WaitSlot (1000)
-        b=Width.GetText
-        printlog "Width is " & b
-        SetClipboard Width.GetText
-        '/// set heigth to 5 ///'
-        Height.SetText "5"
-        printlog "put value into variable"
-        WaitSlot (1000)
-        h=Height.GetText
-        printlog "Height is " & h
-        printlog "check protect"
-        ProtectPosition.Check
-        printlog "close dialog"
-	TabPositionAndSize.OK
+    WaitSlot (1000)
+    Kontext
+    printlog "TabPositionAndSize"
+    WaitSlot (1000)
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    KeepRatio.UnCheck
+    printlog "set width to 10"
+    WaitSlot (1000)
+    Width.SetText "10"
+    printlog "put value into a variable"
+    WaitSlot (1000)
+    b=Width.GetText
+    printlog "Width is " & b
+    SetClipboard Width.GetText
+    printlog "set heigth to 5"
+    Height.SetText "5"
+    printlog "put value into variable"
+    WaitSlot (1000)
+    h=Height.GetText
+    printlog "Height is " & h
+    printlog "check protect"
+    ProtectPosition.Check
+    printlog "close dialog"
+    TabPositionAndSize.OK
     WaitSlot (1000)
     ContextPositionAndSize
-        WaitSlot (1000)
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        WaitSlot (2000)
-        printlog "control size changes"
-        printlog "Width value is: " & Width.GetText
-        printlog "Value from Clipboard is: " & GetClipboardText
-        if Width.GetText = GetClipboardText Then
-            PrintLog "  Size of rectangle could be changed. It is = " + Width.GetText + "   but it should be = " + b
-        else
-            WarnLog "  Controls for height and width do not work"
-        end if
-        printlog "Uncheck the Position-Protection, so we can work with this window."
-        if ProtectPosition.isChecked = FALSE then
-            printlog "Should be checked since it was checked just 16 rows ago"
-	    ErrorLog "ProtectPosition was not checked - why?"   
-        else
-           ProtectPosition.Uncheck
-        end if
+    WaitSlot (1000)
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    WaitSlot (2000)
+    printlog "control size changes"
+    printlog "Width value is: " & Width.GetText
+    printlog "Value from Clipboard is: " & GetClipboardText
+    if Width.GetText = GetClipboardText Then
+        PrintLog "  Size of rectangle could be changed. It is = " + Width.GetText + "   but it should be = " + b
+    else
+        WarnLog "  Controls for height and width do not work"
+    end if
+    printlog "Uncheck the Position-Protection, so we can work with this window."
+    if ProtectPosition.isChecked = FALSE then
+        printlog "Should be checked since it was checked just 16 rows ago"
+        ErrorLog "ProtectPosition was not checked - why?"
+    else
+       ProtectPosition.Uncheck
+    end if
 
-        KeepRatio.Check
-        printlog "raise value for width"
-        Width.More 5
-        if Height.GetText = h Then
-        WarnLog "  Keep ratio does not work properly"
-        else
-        PrintLog "  Keep ratio does work"
-        KeepRatio.UnCheck
-        end if
-        TabPositionAndSize.OK
+    KeepRatio.Check
+    printlog "raise value for width"
+    Width.More 5
+    if Height.GetText = h Then
+    WarnLog "  Keep ratio does not work properly"
+    else
+    PrintLog "  Keep ratio does work"
+    KeepRatio.UnCheck
+    end if
+    TabPositionAndSize.OK
     WaitSlot (2000)
     gMouseClick 90,90
     WaitSlot (2000)
@@ -582,107 +580,107 @@ printlog "New impress doc"
     WaitSlot (2000)
     printlog "Format-Postion and Size"
     FormatPositionAndSize
-        WaitSlot (1000)
-        Kontext
-        printlog "TabPositionAndSize"
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        printlog "default value ?: width :-----"+Width.IsEnabled
-        printlog "check fit width to text"
-        if Width.IsEnabled then FitWidthText.Check
-        if Width.IsEnabled = True Then
-            WarnLog "  Fit width does not work"
-        else
-            PrintLog "  Fit width does work"
-        end if
-        printlog "fit heigth to text"
-	FitHeightText.Check
-        if Height.IsEnabled = True Then
-            WarnLog "  fit heigth doe not work"
-        else
-            PrintLog "  fit heigth does work"
-        end if
-        '   PrintLog "  Fit width to text active:   " + FitWidthText.IsChecked
-        '   PrintLog "  Fit heigth to text active:   " + FitHeightText.IsChecked
-        printlog "uncheck fit width to text"
-        FitWidthText.UnCheck
-        printlog "uncheck fit heigth to text"
-	FitHeightText.Uncheck
-        TabPositionAndSize.OK
+    WaitSlot (1000)
+    Kontext
+    printlog "TabPositionAndSize"
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    printlog "default value ?: width :-----"+Width.IsEnabled
+    printlog "check fit width to text"
+    if Width.IsEnabled then FitWidthText.Check
+    if Width.IsEnabled = True Then
+        WarnLog "  Fit width does not work"
+    else
+        PrintLog "  Fit width does work"
+    end if
+    printlog "fit heigth to text"
+    FitHeightText.Check
+    if Height.IsEnabled = True Then
+        WarnLog "  fit heigth doe not work"
+    else
+        PrintLog "  fit heigth does work"
+    end if
+    '   PrintLog "  Fit width to text active:   " + FitWidthText.IsChecked
+    '   PrintLog "  Fit heigth to text active:   " + FitHeightText.IsChecked
+    printlog "uncheck fit width to text"
+    FitWidthText.UnCheck
+    printlog "uncheck fit heigth to text"
+    FitHeightText.Uncheck
+    TabPositionAndSize.OK
     WaitSlot (1000)
     hTypeKeys "<escape>",2
     hTypeKeys "<TAB>",2
     WaitSlot (1000)
     ContextPositionAndSize
-        WaitSlot (1000)
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        printlog "check x-position of textbox"
-        SetClipboard PositionX.GetText
-        WaitSlot (1000)
-        Kontext
-        printlog "set rotation angle to 50 and position x and y to 1"
-        Active.SetPage TabDrehung
-        Kontext "TabDrehung"
-        PositionX.SetText "1"
-        PositionY.SetText "1"
-        Winkel.SetText "50"
-        w=Winkel.GetText
-        TabDrehung.OK
+    WaitSlot (1000)
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    printlog "check x-position of textbox"
+    SetClipboard PositionX.GetText
+    WaitSlot (1000)
+    Kontext
+    printlog "set rotation angle to 50 and position x and y to 1"
+    Active.SetPage TabDrehung
+    Kontext "TabDrehung"
+    PositionX.SetText "1"
+    PositionY.SetText "1"
+    Winkel.SetText "50"
+    w=Winkel.GetText
+    TabDrehung.OK
     WaitSlot (3000)
 
     printlog "check position of manipulated textbox"
     ContextPositionAndSize
-        WaitSlot (3000)
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        if PositionX = GetClipboardText Then PrintLog "  Position changed due to rotation"
-        Kontext
-        Active.SetPage TabDrehung
-        Kontext "TabDrehung"
-        WaitSlot (1000)
-        printlog "check rotation angle"
-        if Winkel.GetText = w Then PrintLog "  Object rotated"
-        TabDrehung.OK
+    WaitSlot (3000)
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    if PositionX = GetClipboardText Then PrintLog "  Position changed due to rotation"
+    Kontext
+    Active.SetPage TabDrehung
+    Kontext "TabDrehung"
+    WaitSlot (1000)
+    printlog "check rotation angle"
+    if Winkel.GetText = w Then PrintLog "  Object rotated"
+    TabDrehung.OK
 
     printlog "RECTANGLE-----2/2"
     printlog "create rectangle"
     Call hRechteckErstellen (10,60,70,90)
     WaitSlot (2000)
     ContextPositionAndSize
-        WaitSlot (1000)
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        printlog "put x-axis postion of rectangle into clipboard"
-        SetClipboard PositionX.GetText
-        Kontext
-        printlog "set slant angle to 5"
-        Active.SetPage TabSchraegstellen
-        Kontext "TabSchraegstellen"
-        WaitSlot (1000)
-        printlog "set radius to 5"
-        Radius.SetText "5"
-        r=Radius.GetText
-        Winkel.SetText w
-        TabSchraegstellen.OK
+    WaitSlot (1000)
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    printlog "put x-axis postion of rectangle into clipboard"
+    SetClipboard PositionX.GetText
+    Kontext
+    printlog "set slant angle to 5"
+    Active.SetPage TabSchraegstellen
+    Kontext "TabSchraegstellen"
+    WaitSlot (1000)
+    printlog "set radius to 5"
+    Radius.SetText "5"
+    r=Radius.GetText
+    Winkel.SetText w
+    TabSchraegstellen.OK
     WaitSlot (1000)
     ContextPositionAndSize
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        if PositionX <> GetClipboardText Then PrintLog "  Object changed position due to scaling"
-        printlog "Before we change tab, we set the Position-marker back to checked "
-        ProtectPosition.Check
-        Kontext
-        printlog "check slant angle and radius"
-        Active.SetPage TabSchraegstellen
-        Kontext "TabSchraegstellen"
-        if Radius.GetText = r Then PrintLog "  Cornwer radius changed"
-        if Winkel.GetText =w Then PrintLog "  Object rotated over 45°"
-        TabSchraegstellen.OK
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    if PositionX <> GetClipboardText Then PrintLog "  Object changed position due to scaling"
+    printlog "Before we change tab, we set the Position-marker back to checked "
+    ProtectPosition.Check
+    Kontext
+    printlog "check slant angle and radius"
+    Active.SetPage TabSchraegstellen
+    Kontext "TabSchraegstellen"
+    if Radius.GetText = r Then PrintLog "  Cornwer radius changed"
+    if Winkel.GetText =w Then PrintLog "  Object rotated over 45°"
+    TabSchraegstellen.OK
     Call hCloseDocument
     
 endcase 'tiFormatPositionAndSize
@@ -702,64 +700,76 @@ testcase tiFormat3D_Effekte
     Dim Posi as string
 
     Call hNewDocument
-        Call sSelectEmptyLayout
+    Call sSelectEmptyLayout
     printlog "new document"
     '-----------------------------------RECTANGLE------------------------------------------------------
-    Call hRechteckErstellen (20,20,60,70)        '/// create rectangle ///'
+    printlog "create rectangle"
+    Call hRechteckErstellen (20,20,60,70)
     WaitSlot (1000)
-    ContextPositionAndSize                        '/// get position and size of rectangle ///'
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        PositionX.SetText "5"
-        X=PositionX.GetText
-        printlog "--- created RECTANGLE; xPosition @ "+ x
-        TabPositionAndSize.OK
-    ContextConvertInto3D                          '/// convert rectangle into 3d ///'
+    printlog "get position and size of rectangle"
+    ContextPositionAndSize                        
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    PositionX.SetText "5"
+    X=PositionX.GetText
+    printlog "--- created RECTANGLE; xPosition @ "+ x
+    TabPositionAndSize.OK
+    printlog "convert rectangle into 3d"
+    ContextConvertInto3D                          
     WaitSlot (1000)
     Kontext "Drei_D_Effekte"
     if Drei_D_Effekte.exists(3) then
        qaerrorlog "   The 3D-Effects-dialogue was open. Check why."
     else
-       Format3D_Effects                          '/// open 3d flyer///'
+        printlog "open 3d flyer"
+        Format3D_Effects
     end if
-        try
-            if Perspektive.isvisible then
-                Perspektive.Click                         '/// check perspective ///'
-            else
-                warnlog "why not in draw?"
-            end if
-        catch
-            warnlog "something is wrong mit perspective"
-        endcatch
-        Zuweisen.Click                            '/// assign perspective ///'
-        Kontext "DocumentImpress"
-       hTypeKeys "<MOD1 A>"
-        ContextPositionAndSize                        '/// check position and size ///'
-            Kontext
-            Active.SetPage TabPositionAndSize
-            Kontext "TabPositionAndSize"
-            if PositionX.GetText = X Then
-                printlog "- Perspective acitvated x: "+PositionX.GetText
-            else
-                warnlog "- Perspective seems to have a problem, x value has changed!"
-            end if
-            TabPositionAndSize.OK
-        Kontext "Drei_D_Effekte"
-        Aktualisieren.Click
-        Drei_D_Effekte.Close
-    EditSelectAll                   '/// delete rectangle ///'
+    try
+        if Perspektive.isvisible then
+            printlog "check perspective"
+            Perspektive.Click
+        else
+            warnlog "why not in draw?"
+        end if
+    catch
+        warnlog "something is wrong mit perspective"
+    endcatch
+    printlog "assign perspective"
+    Zuweisen.Click
+    Kontext "DocumentImpress"
+    hTypeKeys "<MOD1 A>"
+    printlog "check position and size"
+    ContextPositionAndSize
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    if PositionX.GetText = X Then
+        printlog "- Perspective acitvated x: "+PositionX.GetText
+    else
+        warnlog "- Perspective seems to have a problem, x value has changed!"
+    end if
+    TabPositionAndSize.OK
+    Kontext "Drei_D_Effekte"
+    Aktualisieren.Click
+    Drei_D_Effekte.Close
+    EditSelectAll
+    printlog "delete rectangle"
     hTypeKeys "<DELETE>"
 
     '-----------------------------------RECTANGLE------------------------------------------------------
-    hRechteckErstellen (20,20,60,70)              '/// create new rectangle ///'
+    printlog "create new rectangle"
+    hRechteckErstellen (20,20,60,70)
     printlog "--- created RECTANGLE 2"
-    Format3D_Effects                              '/// open 3d flyer ///'
+    printlog "open 3d flyer"
+    Format3D_Effects                              
     Kontext "Drei_D_Effekte"
-    Rotationskoerper.Click                        '/// create lathe object ///'
+    printlog "create lathe object"
+    Rotationskoerper.Click                        
     WaitSlot (1000)
     Kontext "DocumentImpress"
-    ContextPositionAndSize                        '/// check position and size ///'
+    printlog "check position and size"
+    ContextPositionAndSize                        
         Kontext
         Active.SetPage TabPositionAndSize
         Kontext "TabPositionAndSize"
@@ -770,14 +780,17 @@ testcase tiFormat3D_Effekte
         end if
         TabPositionAndSize.OK
     EditSelectAll
-    hTypeKeys "<DELETE>"                         '/// delete object ///'
+    printlog "delete object"
+    hTypeKeys "<DELETE>"                         
     Sleep (1)
     '-----------------------------------RECTANGLE------------------------------------------------------
-    hRechteckErstellen (20,20,60,70)             '/// create rectangle ///'
+    printlog "create rectangle"
+    hRechteckErstellen (20,20,60,70)
     printlog "--- created RECTANGLE 3"
     Kontext "Drei_D_Effekte"
     WaitSlot (1000)
-    In_3D_Umwandeln.Click                        '/// convert to 3d in 3d flyer ///'
+    printlog "convert to 3d in 3d flyer"
+    In_3D_Umwandeln.Click                        
     WaitSlot (2000)
     gMouseClick 40,40
     qaerrorlog "#i92910: automation: crash when executing tiFormat3D_Effekte in test g_format"
@@ -799,27 +812,36 @@ testcase tiFormat3D_Effekte
     'end select
     
     EditSelectAll
-    hTypeKeys "<DELETE>"                        '/// delete object ///'
+    printlog "delete object"
+    hTypeKeys "<DELETE>"                        
 
     '-----------------------------------ZYLINDER------------------------------------------------------
     Sleep (1)
-    printlog "--- create CYLINDER"
-    WL_SD_Zylinder                              '/// create cylinder ///'
-    gMousemove 30,30,80,80  '/// This affects the Vertical-value down to 15 ///'
+    printlog "create CYLINDER"
+    WL_SD_Zylinder
+    printlog "This affects the Vertical-value down to 15"
+    gMousemove 30,30,80,80  
     Sleep (1)
     hTypeKeys "<ESC>"
     Kontext "Drei_D_Effekte"
-    Geometrie.Click                              '///  geometry ///'
+    printlog " geometry"
+    Geometrie.Click                              
     WaitSlot (1000)
     '   Endwinkel.More
-    Vert=Vertikale_Segmente.GetText             '/// get value for vertical segments (default) ///'
-    Hor =Horizontale_Segmente.GetText           '/// get value for horizontal segments (default) ///'
-    Rund=Kantenrundung.GetText                  '/// get value for edge rounding ///'
-    Skal=Tiefenskalierung.GetText               '/// get value for scale ///'
-    Tief=Tiefe.GetText                          '/// get value for depth ///'
-    Winkel=Endwinkel.GetText                    '/// get value for angle ///'
+    printlog "get value for vertical segments (default)"
+    Vert=Vertikale_Segmente.GetText
+    printlog "get value for horizontal segments (default)"
+    Hor =Horizontale_Segmente.GetText
+    printlog "get value for edge rounding"
+    Rund=Kantenrundung.GetText
+    printlog "get value for scale"
+    Skal=Tiefenskalierung.GetText
+    printlog "get value for depth"
+    Tief=Tiefe.GetText
+    printlog "get value for angle"
+    Winkel=Endwinkel.GetText                    
 
-    '/// Check if every entry has a value <> "" -> an init value is shown. ///'
+    printlog "Check if every entry has a value <> "" -> an init value is shown."
     if Vert  ="" then warnlog "Vertical Segment   has no init value"
     if Hor   ="" then warnlog "Horizontal Segment has no init value"
     if Rund  ="" then warnlog "Rounded edges      has no init value"
@@ -827,49 +849,54 @@ testcase tiFormat3D_Effekte
     if Tief  ="" then warnlog "Depth              has no init value"
     if Winkel="" then printlog "Rotation angle    has no init value"
 
-    '/// Go back to the 3d-effects-dialogue and change the value for the cylinder ///'
-
-    hTypeKeys "<ESC>"                 '/// Deselect object and check if 3d controller has default values again ///'
+    printlog "Go back to the 3d-effects-dialogue and change the value for the cylinder"
+    hTypeKeys "<ESC>"                 
     Kontext "Drei_D_Effekte"
 
-    '/// Check if value for vertical segments has changed in 3d controller ///'
+    printlog "Check if value for vertical segments has changed in 3d controller"
     if Vertikale_Segmente.GetText = Vert Then
         Printlog "- Vertical segment value read from object's properties in the 3d flyer"
     else
         Warnlog "- 3D flyer could not read vertical segment information from object. It is = '"+ Vertikale_Segmente.GetText + "'  but should be = '" + Vert + "'"
     end if
 
-    if Horizontale_Segmente.GetText = Hor Then          '/// check if value for horizontal segments has changed ///'
+    printlog "check if value for horizontal segments has changed"
+    if Horizontale_Segmente.GetText = Hor Then          
         Printlog "- Horizontal segment value read from object's properties in the 3d flyer"
     else
         Warnlog "- 3D flyer not be able to read horizonal segment information from object. It is = '"+ Horizontale_Segmente.GetText + "'  but should be = '" + Hor + "'"
     end if
 
-    if Kantenrundung.GetText = Rund Then                '/// check if value for edge rounding has changed ///'
+    printlog "check if value for edge rounding has changed"
+    if Kantenrundung.GetText = Rund Then                
         Printlog "- Rounded edges works"
     else
         Warnlog "- Rounded edges value could not be read by the 3d flyer It is = '" + Kantenrundung.GetText + "'  but should be = '" + rund + "'"
     end if
 
-    if Tiefenskalierung.GetText = Skal Then             '/// check value for scale ///'
+    printlog "check value for scale"
+    if Tiefenskalierung.GetText = Skal Then             
         Printlog "- Scaled depth works"
     else
         Warnlog "- Scale depth value could not be read by the 3d flyer It is = '" + Tiefenskalierung.GetText + "'  but should be = '" + skal + "'"
     end if
 
-    if Tiefe.GetText = Tief Then                        '/// check value for depth ///'
+    printlog "check value for depth"
+    if Tiefe.GetText = Tief Then                        
         Printlog "- Depth value could be read by the 3d flyer"
     else
         Warnlog "- Depth value of object could not be read by the flyer It is = '"+ Tiefe.GetText + "'  but should be = '" + tief + "'"
     end if
 
-    if Endwinkel.GetText = Winkel Then                   '/// check value for angle ///'
+    printlog "check value for angle"
+    if Endwinkel.GetText = Winkel Then                   
         Printlog "- Angle value could be read by the 3d flyer"
     else
         Warnlog "- Angle value is not correct"
     end if
 
-    hTypeKeys "<ESC>"                                    '/// deselect object and check if 3d controller has default values again ///'
+    printlog "deselect object and check if 3d controller has default values again"
+    hTypeKeys "<ESC>"                                    
     Kontext "Drei_D_Effekte"
     Sleep (2)
     Printlog "- check if 3D flyer goes back to default values if object is deselected"
@@ -882,16 +909,19 @@ testcase tiFormat3D_Effekte
 
     hTypeKeys "<TAB>"
     Kontext "Drei_D_Effekte"
-        Sleep (2)
-        Horizontale_Segmente.SetText "32"                  '/// change horizontal and vertical segments ///'
-        Vertikale_Segmente.SetText "32"
-        Kantenrundung.SetText "100"
-        Endwinkel.Settext "300"
-        Tiefenskalierung.SetText "500"
-        Tiefe.SetText "100"
-        Zuweisen.Click                                     '/// assign changes ///'
+    Sleep (2)
+    printlog "change horizontal and vertical segments"
+    Horizontale_Segmente.SetText "32"
+    Vertikale_Segmente.SetText "32"
+    Kantenrundung.SetText "100"
+    Endwinkel.Settext "300"
+    Tiefenskalierung.SetText "500"
+    Tiefe.SetText "100"
+    printlog "assign changes"
+    Zuweisen.Click
 
-    WaitSlot (1000)                                            '/// check value changes ///'
+    printlog "check value changes"
+    WaitSlot (1000)                                            
     if Vertikale_Segmente.GetText = Vert Then Warnlog "- Default value is wrong"
     if Horizontale_Segmente.GetText = Hor Then Warnlog "- Default value is wrong"
     if Kantenrundung.GetText = Rund Then Warnlog "- Default value is wrong"
@@ -899,87 +929,103 @@ testcase tiFormat3D_Effekte
     if Endwinkel.GetText = Winkel Then Warnlog "- Default value is wrong"
     if Tiefe.GetText=Tief Then Warnlog "- Default value is wrong"
     EditSelectAll
-    hTypeKeys "<DELETE>"                               '/// delete cylinder ///'
+    printlog "delete cylinder"
+    hTypeKeys "<DELETE>"                               
 
     '-----------------------------------ZYLINDER------------------------------------------------------
-    WL_SD_Zylinder                                     '/// create new cylinder ///'
+    printlog "create new cylinder"
+    WL_SD_Zylinder
     gMouseMove (20,20,60,60)
     WaitSlot (3000)
     Kontext "Drei_D_Effekte"
-        Printlog "- Change basic geometric parameters for the object"
-        Printlog "Segments : Horizontal: 8; Vertical: 8; Rounded edges: 50 %"
-        Horizontale_Segmente.SetText "8"                   '/// changing values for cylinder ///'
-        Vertikale_Segmente.SetText "8"
-        Kantenrundung.SetText "50 %"
-        Sleep (1)
-        Zuweisen.Click
+    Printlog "- Change basic geometric parameters for the object"
+    Printlog "Segments : Horizontal: 8; Vertical: 8; Rounded edges: 50 %"
+    printlog "changing values for cylinder"
+    Horizontale_Segmente.SetText "8"
+    Vertikale_Segmente.SetText "8"
+    Kantenrundung.SetText "50 %"
+    Sleep (1)
+    Zuweisen.Click
     WaitSlot (2000)
     gMouseClick 90,90
     Sleep (2)
-    EditSelectAll                                    '/// select object ///'
+    printlog "select object"
+    EditSelectAll                                    
     WaitSlot (1000)
-    Kontext "Drei_D_Effekte"                       '/// control if changes are done ///'
-        if Horizontale_Segmente.GetText <> "8" Then Warnlog "- Horizontal segment count is not correct "+Horizontale_Segmente.GetText
-        if Vertikale_Segmente.GetText <> "8" Then Warnlog "- Vertical segment count is not correct "+Vertikale_Segmente.GetText
-        if Kantenrundung.GetText <> "50 %" Then Warnlog "- Value for rounded edges is not correct "+Kantenrundung.GetText
+    printlog "control if changes are done"
+    Kontext "Drei_D_Effekte"                       
+    if Horizontale_Segmente.GetText <> "8" Then Warnlog "- Horizontal segment count is not correct "+Horizontale_Segmente.GetText
+    if Vertikale_Segmente.GetText <> "8" Then Warnlog "- Vertical segment count is not correct "+Vertikale_Segmente.GetText
+    if Kantenrundung.GetText <> "50 %" Then Warnlog "- Value for rounded edges is not correct "+Kantenrundung.GetText
     Darstellung.Click
-    Zaehler=Modus.GetItemCount                  '/// get number of pssibole render methods ///'
+    printlog "get number of pssibole render methods"
+    Zaehler=Modus.GetItemCount                  
     for i =1 to Zaehler
         Modus.Select i
-        Zuweisen.Click                        '/// assign every render method ///'
+        printlog "assign every render method"
+        Zuweisen.Click                        
         gMouseClick 90,90
         Sleep (1)
-        EditSelectAll                                    '/// select object ///'
+        printlog "select object"
+        EditSelectAll                                    
         Sleep (1)
         Kontext "Drei_D_Effekte"
-        if Modus.GetSelIndex <> i Then Warnlog "- Value for render modus did not change"   '/// check if render method has changed ///'
+        printlog "check if render method has changed"
+        if Modus.GetSelIndex <> i Then Warnlog "- Value for render modus did not change"   
     next i
-        Printlog "- Check 3d shadow and surface angle"
-        Drei_DSchatten.Click                              '/// check 3d shadow ///'
-        Papierneigung.SetText "90 degree(s)"
-        vert = Papierneigung.getText
-        Zuweisen.Click                                    '/// assign shadow ///'
-    gMouseClick 90,90                                     '/// deselect object ///'
+    Printlog "- Check 3d shadow and surface angle"
+    Drei_DSchatten.Click
+    Papierneigung.SetText "90 degree(s)"
+    vert = Papierneigung.getText
+    printlog "assign shadow"
+    Zuweisen.Click
+    printlog "deselect object"
+    gMouseClick 90,90                                     
     WaitSlot (1000)
-    EditSelectAll                                  '/// select object ///'
+    printlog "select object"
+    EditSelectAll
+    printlog "check value changes"
     Kontext "Drei_D_Effekte"
-        if Papierneigung.GetText <> vert Then Warnlog "- Value for surface angle is not correct"   '/// check value changes ///'
-        Entfernung.SetText "10"                             '/// set distance to 10 ///'
-        Sleep (1)
-        hor = Entfernung.getText
-        Sleep (1)
-	Zuweisen.Click
+    if Papierneigung.GetText <> vert Then Warnlog "- Value for surface angle is not correct"
+    printlog "set distance to 10"
+    Entfernung.SetText "10"
+    Sleep (1)
+    hor = Entfernung.getText
+    Sleep (1)
+    Zuweisen.Click
     if Entfernung.GetText <> hor Then Warnlog "- Value for distance is not correct; should: "+hor+"; is: "+Entfernung.GetText
     WaitSlot (2000)
     hTypeKeys "<TAB>"
     Sleep (2)
     ContextPositionAndSize
-        WaitSlot (2000)
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        PositionX.SetText "5,00cm"
-        Posi=PositionX.GetText
-        TabPositionAndSize.OK
+    WaitSlot (2000)
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    PositionX.SetText "5,00cm"
+    Posi=PositionX.GetText
+    TabPositionAndSize.OK
     WaitSlot (1000)
     Kontext "Drei_D_Effekte"
 
-    Brennweite.SetText "50"                             '/// set focval length to 50 ///'
+    printlog "set focval length to 50"
+    Brennweite.SetText "50"                             
     Zuweisen.Click
-    ContextPositionAndSize                            '/// check change in position of the object ///'
-        Kontext
-        Active.SetPage TabPositionAndSize
-        Kontext "TabPositionAndSize"
-        If PositionX.GetText = Posi Then 
-            printlog "- Raising value for focal length has not changed optical appearence of object, ok."
-        else
-            warnlog "Problem with focal lenght here!"
-        endif
-        TabPositionAndSize.OK
+    printlog "check change in position of the object"
+    ContextPositionAndSize                            
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    If PositionX.GetText = Posi Then
+        printlog "- Raising value for focal length has not changed optical appearence of object, ok."
+    else
+        warnlog "Problem with focal lenght here!"
+    endif
+    TabPositionAndSize.OK
     WaitSlot (1000)
     Kontext "Drei_D_Effekte"
-        Brennweite.SetText "5"
-        Zuweisen.Click
+    Brennweite.SetText "5"
+    Zuweisen.Click
     WaitSlot (1000)
     EditSelectAll
     WaitSlot (3000)
@@ -1008,71 +1054,78 @@ testcase tdFormatTemplates
     qaerrorlog "Not yet ready."
     goto endsub
 
-     dim Zaehler as integer
-     dim i as integer
-     dim x as integer
-     dim iWaitIndex as integer
-     dim sStyleName as string
-     dim bDouble as boolean
-     dim sTemp(2) as string
-    
-     Call hNewDocument               '/// new impress document ///'
-    
-       WaitSlot (5000)
-     FormatStylesCatalog             '/// format-Style catalog///'
-     iWaitIndex = 0
-     do while Vorlagenkatalog.NotExists AND iWaitIndex < 10
+    dim Zaehler as integer
+    dim i as integer
+    dim x as integer
+    dim iWaitIndex as integer
+    dim sStyleName as string
+    dim bDouble as boolean
+    dim sTemp(2) as string
+
+    printlog "new impress document"
+    Call hNewDocument
+
+    WaitSlot (5000)
+    printlog "format-Style catalog!"
+    FormatStylesCatalog
+    iWaitIndex = 0
+    do while Vorlagenkatalog.NotExists AND iWaitIndex < 10
         sleep (1)
         iWaitIndex = iWaitIndex + 1
-     loop
+    loop
     
-     Kontext "Vorlagenkatalog"
-     Vorlagen.GetItemCount                             '/// get item count for templates ///'
-      Vorlagen.Select 2              '/// select template 2 ///'
-    
-     if Bereich.GetItemCount = Vorlagen.GetItemCount Then    '/// check if area changes when selecting a template ///'
-       PrintLog " - Area did changed"
-     else
-       WarnLog " Number of entrees should be 2, but it is " + Bereich.GetItemCount
-     end if
-    
-     Zaehler = Ansicht.GetItemCount              'Vorlagenliste.GetItemCount
+    Kontext "Vorlagenkatalog"
+    printlog "get item count for templates"
+    Vorlagen.GetItemCount
+    printlog "select template 2"
+    Vorlagen.Select 2
+
+    printlog "check if area changes when selecting a template"
+    if Bereich.GetItemCount = Vorlagen.GetItemCount Then
+        PrintLog " - Area did changed"
+    else
+        WarnLog " Number of entrees should be 2, but it is " + Bereich.GetItemCount
+    end if
     
-     for i = 1 to Zaehler
-       Ansicht.TypeKeys "<DOWN>" ,i
-       SetClipboard Ansicht.GetSelText
+    Zaehler = Ansicht.GetItemCount              'Vorlagenliste.GetItemCount
+
+    for i = 1 to Zaehler
+        Ansicht.TypeKeys "<DOWN>" ,i
+        SetClipboard Ansicht.GetSelText
         WaitSlot (2000)
-       Vorlagen.Select 1
-       PrintLog   "    "+i+": Offset: '" + Vorlagen.GetSelText+"'"
-       if Bereich.GetItemCount=Vorlagen.GetItemCount Then WarnLog " Range has not changed"
-       Vorlagen.Select 2
+        Vorlagen.Select 1
+        PrintLog   "    "+i+": Offset: '" + Vorlagen.GetSelText+"'"
+        if Bereich.GetItemCount=Vorlagen.GetItemCount Then WarnLog " Range has not changed"
+        Vorlagen.Select 2
         WaitSlot (1000)
         Ansicht.TypeKeys "<HOME>"
         WaitSlot (1000)
-       Ansicht.Select 1
+        Ansicht.Select 1
         WaitSlot (1000)
-       PrintLog "     : Offset: '"+Vorlagen.GetSelText + "'; Opinion: '" + Ansicht.GetSelText+"'"
-       Vorlagenkatalog.OK
-       FormatStylesCatalog
-       Kontext "Vorlagenkatalog"
-     next i
+        PrintLog "     : Offset: '"+Vorlagen.GetSelText + "'; Opinion: '" + Ansicht.GetSelText+"'"
+        Vorlagenkatalog.OK
+        FormatStylesCatalog
+        Kontext "Vorlagenkatalog"
+    next i
     
-     Vorlagen.Select 2
-     WaitSlot (2000)
-     Vorlagen.Select 1                  '/// select first template ///'
-     if Neu.IsEnabled =False Then WarnLog " Button must be choosable, but is not"
-     Ansicht.Select 1
-      WaitSlot (1000)
-     Neu.Click                    '/// create new template ///'
-       Kontext
-       Active.SetPage TabVerwalten
-       Kontext "TabVerwalten"
-       sStyleName = VorlagenName.GetText
-       printlog "   created new style: '"+sStyleName +"'"
-     TabVerwalten.OK
-       PrintLog " New template created"
-     Kontext "Vorlagenkatalog"
-      WaitSlot (1000)
+    Vorlagen.Select 2
+    WaitSlot (2000)
+    printlog "select first template"
+    Vorlagen.Select 1
+    if Neu.IsEnabled =False Then WarnLog " Button must be choosable, but is not"
+    Ansicht.Select 1
+    WaitSlot (1000)
+    printlog "create new template"
+    Neu.Click
+    Kontext
+    Active.SetPage TabVerwalten
+    Kontext "TabVerwalten"
+    sStyleName = VorlagenName.GetText
+    printlog "   created new style: '"+sStyleName +"'"
+    TabVerwalten.OK
+    PrintLog " New template created"
+    Kontext "Vorlagenkatalog"
+    WaitSlot (1000)
      ' find newly created style, because they are alphabetical ordered :-( i have to check every entry :-(((((
        Zaehler = Ansicht.GetItemCount
        i=1
@@ -1122,10 +1175,11 @@ testcase tdFormatTemplates
            wEnd
        end if
        if (i <= Zaehler) then  printlog "   found created entry for deleting it :-)"
-    ' Ansicht.TypeKeys "<DOWN>" ,( i + 1 )           '/// control if template list has created template included ///'
+    ' Ansicht.TypeKeys "<DOWN>" ,( i + 1 )           printlog "control if template list has created template included"
       WaitSlot (2000)
      try
-        Loeschen.Click                  '/// delete template ///'
+        printlog "delete template"
+        Loeschen.Click                  
         WaitSlot (1000)
         Kontext "Active"
         if active.exists then
@@ -1145,7 +1199,8 @@ testcase tdFormatTemplates
     UseBindings
      Ansicht.Select 1
       WaitSlot (1000)
-    Aendern.Click                    '/// modify template ///'
+      printlog "modify template"
+    Aendern.Click                    
      WaitSlot (2000)
      Kontext
      Active.SetPage TabSchatten
@@ -1154,8 +1209,9 @@ testcase tdFormatTemplates
      TabSchatten.Cancel
      WaitSlot (2000)
      Kontext "Vorlagenkatalog"
-    
-     Verwalten.Click                 '/// organize templates ///'
+
+     printlog "organize templates"
+     Verwalten.Click                 
      WaitSlot (2000)
      Kontext "DVVerwalten"
      DVVerwalten.OK
@@ -1166,21 +1222,27 @@ testcase tdFormatTemplates
      catch
         Warnlog " - Style Catalog can't close unless the Template Management-dialog is closed"
      endcatch
-     PrintLog " FormatStylesCatalog finished"        '/// close template catalog ///'
+     PrintLog " FormatStylesCatalog finished"        
      WaitSlot (2000)
-     FormatModifyLayout                 '/// format modify layout ///'
+     printlog "format modify layout"
+     FormatModifyLayout                 
      WaitSlot (2000)
      Kontext "Seitenvorlage"
-     if HintergrundseiteAustauschen.IsChecked=True Then HintergrundseiteAustauschen.UnCheck   '/// uncheck switch background page ///'
-     Laden.Click                     '/// load ///'
+     printlog "uncheck switch background page"
+     if HintergrundseiteAustauschen.IsChecked=True Then HintergrundseiteAustauschen.UnCheck   
+    printlog "load"
+    Laden.Click
      WaitSlot (2000)
      Kontext "Neu"
      Neu.Cancel
-     Kontext "Seitenvorlage"               '/// choose a page layout ///'
+     printlog "choose a page layout"
+     Kontext "Seitenvorlage"               
      'Waehlen.Click
-     Seitenvorlage.OK                '/// close dialog ///'
-    
-     Call hCloseDocument                '/// close document ///'
+     printlog "close dialog"
+     Seitenvorlage.OK                
+
+     printlog "close document"
+     Call hCloseDocument                
 
 endcase 'tdFormatTemplates
 '-------------------------------------------------------------------------------
@@ -1195,56 +1257,56 @@ testcase tiFormatAufzaehlungszeichen
     Kontext "DocumentImpress"
     hTextrahmenErstellen ("Hello <Return><Return>",20,20,60,60)
     for i=1 to 8
-      Kontext "DocumentImpress"
-      gMouseClick 30,30
-      EditSelectAll
-      WaitSlot (1000)
-      FormatNumberingBulletsDraw
-      WaitSlot (2000)
-      Kontext
-      Active.SetPage TabBullet
-      Kontext "TabBullet"
-      Auswahl.TypeKeys "<Right>", i
-      TabBullet.OK
-      Kontext "DocumentImpress"
+        Kontext "DocumentImpress"
+        gMouseClick 30,30
+        EditSelectAll
+        WaitSlot (1000)
+        FormatNumberingBulletsDraw
+        WaitSlot (2000)
+        Kontext
+        Active.SetPage TabBullet
+        Kontext "TabBullet"
+        Auswahl.TypeKeys "<Right>", i
+        TabBullet.OK
+        Kontext "DocumentImpress"
     next i
     for i=1 to 8
-      Kontext "DocumentImpress"
-      gMouseClick 30,30
-      EditSelectAll
-      WaitSlot (1000)
-      FormatNumberingBulletsDraw
-      Kontext
-      Active.SetPage TabNumerierungsart
-      Kontext "TabNumerierungsart"
-      Auswahl.TypeKeys "<Right>", i
-      TabNumerierungsart.OK
-      Kontext "DocumentImpress"
+        Kontext "DocumentImpress"
+        gMouseClick 30,30
+        EditSelectAll
+        WaitSlot (1000)
+        FormatNumberingBulletsDraw
+        Kontext
+        Active.SetPage TabNumerierungsart
+        Kontext "TabNumerierungsart"
+        Auswahl.TypeKeys "<Right>", i
+        TabNumerierungsart.OK
+        Kontext "DocumentImpress"
     next i
     for i=1 to 8
-      Kontext "DocumentImpress"
-      gMouseClick 30,30
-      EditSelectAll
-      FormatNumberingBulletsDraw
-      Kontext
-      Active.SetPage TabNumerierungsart
-      Kontext "TabNumerierungsart"
-      Auswahl.TypeKeys "<Right>", i
-      TabNumerierungsart.OK
-      Kontext "DocumentImpress"
+        Kontext "DocumentImpress"
+        gMouseClick 30,30
+        EditSelectAll
+        FormatNumberingBulletsDraw
+        Kontext
+        Active.SetPage TabNumerierungsart
+        Kontext "TabNumerierungsart"
+        Auswahl.TypeKeys "<Right>", i
+        TabNumerierungsart.OK
+        Kontext "DocumentImpress"
     next i
     WaitSlot (3000)
     for i=1 to 29
-      WaitSlot (3000)
-      FormatNumberingBulletsDraw
-      WaitSlot (3000)
-      Kontext
-      Active.SetPage TabGrafiken
-      Kontext "TabGrafiken"
-      sleep 1
-      Auswahl.TypeKeys "<Right>", i
-      TabGrafiken.OK
-      Kontext "DocumentImpress"
+        WaitSlot (3000)
+        FormatNumberingBulletsDraw
+        WaitSlot (3000)
+        Kontext
+        Active.SetPage TabGrafiken
+        Kontext "TabGrafiken"
+        sleep 1
+        Auswahl.TypeKeys "<Right>", i
+        TabGrafiken.OK
+        Kontext "DocumentImpress"
     next i
     
     gMouseClick 90,90
diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc
index adc573a16e48..2a6d5b315f89 100644
--- a/testautomation/graphics/optional/includes/global/g_line.inc
+++ b/testautomation/graphics/optional/includes/global/g_line.inc
@@ -43,35 +43,46 @@ testcase tiFormatLine
     Dim k               'Variable fuer Transparenz (Anzahl)
     Dim l
     Dim ZaehlerStilLinks
-    
-    Call hNewDocument       '/// New impress document
+
+    printlog "New impress document"
+    Call hNewDocument       
     sleep 3
-    Call hRechteckErstellen (10,10,60,60)     '/// create rectangle
+    printlog "create rectangle"
+    Call hRechteckErstellen (10,10,60,60)     
     sleep 2
-    FormatLine        '/// open Format line dialog
+    printlog "open Format line dialog"
+    FormatLine        
     Kontext
-    Active.SetPage TabLinie '///Open TabLine Tabpage
+    printlog "Open TabLine Tabpage"
+    Active.SetPage TabLinie 
     Kontext "TabLinie"
     sleep 2
-    Stil.GetItemCount       '/// Get item count for style ///'
-    Farbe.GetItemCount       '/// Get item count for color ///'
-    Breite.More 1        '/// change value for ///'
+    printlog "Get item count for style"
+    Stil.GetItemCount
+    printlog "Get item count for color"
+    Farbe.GetItemCount
+    printlog "change value for"
+    Breite.More 1        
     ZaehlerStil = Stil.GetItemCount
     ZaehlerFarbe = Farbe.GetItemCount
-    
-    for i=1 to ZaehlerStil      '/// Apply every style to the rectangle ///'
-       wait 10
-       Stil.Select i
-       wait 10
-       TabLinie.OK '/// Closing dialog with ok
-    '    Kontext "DocumentImpress"
-       FormatLine '///Open TabLine Tabpage
-       Kontext
-       Active.SetPage TabLinie
-       Kontext "TabLinie"
+
+    printlog "Apply every style to the rectangle"
+    for i=1 to ZaehlerStil      
+        wait 10
+        Stil.Select i
+        wait 10
+        printlog "Closing dialog with ok"
+        TabLinie.OK 
+        '    Kontext "DocumentImpress"
+        printlog "Open TabLine Tabpage"
+        FormatLine
+        Kontext
+        Active.SetPage TabLinie
+        Kontext "TabLinie"
     next i
-    
-    for j=1 to ZaehlerFarbe      '/// Apply every color to the rectangle///'
+
+    printlog "Apply every color to the rectangle"
+    for j=1 to ZaehlerFarbe      
        PrintLog "-- " + Farbe.GetSelText
        wait 10
        Farbe.Select j
@@ -83,38 +94,46 @@ testcase tiFormatLine
        Active.SetPage TabLinie
        Kontext "TabLinie"
     next j
-    Breite.More 3        '/// change Breite ///'
+    printlog "change Breite"
+    Breite.More 3        
     Breite.Less 2
     for k=1 to 6
-       Transparenz.More 1      '/// change tranparence///'
+        printlog "change tranparence"
+        Transparenz.More 1
     next k
     TabLinie.OK
     '---------------------------------------
     sleep 2
-    EditSelectAll     '/// Select all objects in document ///'
+    printlog "Select all objects in document"
+    EditSelectAll     
     sleep 2
-    hTypeKeys "<DELETE>"     '/// Delete objects ///'
+    printlog "Delete objects"
+    hTypeKeys "<DELETE>"     
     sleep 2
     FormatLine
     
     Kontext
-    Active.SetPage TabLinie      '/// TabLine ///'
+    printlog "TabLine"
+    Active.SetPage TabLinie      
     Kontext "TabLinie"
     StilLinks.GetItemCount
     ZaehlerStilLinks=StilLinks.GetItemCount
-    for l=1 to ZaehlerStilLinks      '/// Apply all line end styles///'
-      wait 10
-      if EndenSynchronisieren.IsChecked=False Then EndenSynchronisieren.Check '/// check synchronize ///'
-      wait 10
-      StilLinks.Select l
-      if StilLinks.GetSelText<>StilRechts.GetSelText Then
-         WarnLog "  Ends not synchronized. " + StilLinks.GetSelText + "   Right:  " + StilRechts.GetSelText   '/// check if style is automatically applied for both ends ///'
-      else
-         PrintLog "  Left:  " + StilLinks.GetSelText + "   Right:  " + StilRechts.GetSelText
-      end if
-       EndenSynchronisieren.UnCheck
+    printlog "Apply all line end styles"
+    for l=1 to ZaehlerStilLinks      
+        wait 10
+        printlog "check synchronize"
+        if EndenSynchronisieren.IsChecked=False Then EndenSynchronisieren.Check
+        wait 10
+        StilLinks.Select l
+        printlog "check if style is automatically applied for both ends"
+        if StilLinks.GetSelText<>StilRechts.GetSelText Then
+            WarnLog "  Ends not synchronized. " + StilLinks.GetSelText + "   Right:  " + StilRechts.GetSelText
+        else
+            PrintLog "  Left:  " + StilLinks.GetSelText + "   Right:  " + StilRechts.GetSelText
+        end if
+        EndenSynchronisieren.UnCheck
     next l
-    ZentriertLinks.Check
+ZentriertLinks.Check
     if ZentriertRechts.isChecked = True Then PrintLog "  Centered right does work"
     i = CornerStyle.GetItemCount
     if i <> 4 then warnlog "CornerStyle should contain four options, but currently has: " + i
@@ -130,15 +149,18 @@ testcase tiFormatLine
     Kontext
     Active.SetPage TabLinienstile
     Kontext "TabLinienstile"
-    Hinzufuegen.Click        '/// Add new line style ///'
+    printlog "Add new line style"
+    Hinzufuegen.Click        
     Kontext "NameDlg"
-    Eingabefeld.SetText "Testlinie2"      '/// insert name of style (Testlinie2) ///'
+    printlog "insert name of style (Testlinie2)"
+    Eingabefeld.SetText "Testlinie2"      
     NameDlg.OK
     sleep 1
     Kontext
     Active.SetPage TabLinienstile
     Kontext "TabLinienstile"
-    Loeschen.Click         '/// delete created style ///'
+    printlog "delete created style"
+    Loeschen.Click         
     Kontext "Active"
     Active.Yes
     Kontext
@@ -151,33 +173,41 @@ testcase tiFormatLine
     LaengeLinks.More 3
     LaengeRechts.More 3
     Abstand.SetText "0,1"
-    if AnLinienbreite.IsChecked = True Then AnLinienbreite.Click   '/// all fields changed in TabLinienstile ///'
+    printlog "all fields changed in TabLinienstile"
+    if AnLinienbreite.IsChecked = True Then AnLinienbreite.Click   
     PrintLog "  All controls could be manipulated."
     TypLinks.Select 1
     TypRechts.Select 1
-    if LaengeLinks.IsEnabled And LaengeRechts.IsEnabled =True Then  '/// check if its possible to apply a length to a point ///'
-     WarnLog "  A point where you can change its length is not a point anymore"
+    printlog "check if its possible to apply a length to a point"
+    if LaengeLinks.IsEnabled And LaengeRechts.IsEnabled =True Then  
+        WarnLog "  A point where you can change its length is not a point anymore"
     else
-     PrintLog "  Line style pint tested"    '/// All styles for points are changed  ///'
+        printlog "All styles for points are changed "
+        PrintLog "  Line style pint tested"
     end if
     sleep 1
     try
-     Linienstil.Select 1
+        Linienstil.Select 1
     catch
-     if Linienstil.GetItemCount = 0 then     '/// check if style list is filled ///'
-        Warnlog "- The list for line styles is empty"
-        Hinzufuegen.Click      '/// new style ///'
-        Kontext "NameDlg"
-        NameDlg.OK
-     end if
+        printlog "check if style list is filled"
+        if Linienstil.GetItemCount = 0 then
+            Warnlog "- The list for line styles is empty"
+            printlog "new style"
+            Hinzufuegen.Click
+            Kontext "NameDlg"
+            NameDlg.OK
+        end if
     endcatch
     Kontext
     Active.SetPage TabLinienstile
     Kontext "TabLinienstile"
-    Aendern.Click         '/// change style ///'
+    printlog "change style"
+    Aendern.Click         
     Kontext "NameDlg"
-    Eingabefeld.SetText Eingabefeld.GetText + "1"     '/// new name for changed style ///'
-    SetClipboard Eingabefeld.GetText      '/// put name into clipboard ///'
+    printlog "new name for changed style"
+    Eingabefeld.SetText Eingabefeld.GetText + "1"
+    printlog "put name into clipboard"
+    SetClipboard Eingabefeld.GetText      
     NameDlg.OK
     Kontext
     Active.SetPage TabLinienstile
@@ -194,7 +224,8 @@ testcase tiFormatLine
     Hinzufuegen.Click
     endcatch
     Kontext "NameDlg"
-    if Eingabefeld.GetText <> GetClipboardText Then WarnLog "No changes for Line style"  '/// check if changed style is in list ///'
+    printlog "check if changed style is in list"
+    if Eingabefeld.GetText <> GetClipboardText Then WarnLog "No changes for Line style"  
     NameDlg.Cancel
     sleep 2
     Kontext
@@ -202,18 +233,19 @@ testcase tiFormatLine
     Kontext "TabLinienstile"
     sleep 1
     try
-     Loeschen.Click           '/// delete changed style ///'
-     Kontext "Active"
-     Active.Yes
-     sleep 3
+        printlog "delete changed style"
+        Loeschen.Click
+        Kontext "Active"
+        Active.Yes
+        sleep 3
     catch
-    if Linienstile.GetItemCount = 0 Then
-       Hinzufuegen.Click
-       Kontext "NameDlg"
-       sleep 1
-       Eingabefeld.SetText "Delete"
-       NameDlg.OK
-    end if
+        if Linienstile.GetItemCount = 0 Then
+            Hinzufuegen.Click
+            Kontext "NameDlg"
+            sleep 1
+            Eingabefeld.SetText "Delete"
+            NameDlg.OK
+        end if
     endcatch
     Kontext
     Active.SetPage TabLinienstile
@@ -222,7 +254,8 @@ testcase tiFormatLine
     TabLinienstile.OK
     '--------------------------------------------
     sleep 2
-    Call hRechteckErstellen (40,40,80,50)         '/// create rectangle ///'
+    printlog "create rectangle"
+    Call hRechteckErstellen (40,40,80,50)         
     sleep 2
     FormatLine
     Kontext
@@ -230,7 +263,8 @@ testcase tiFormatLine
     Kontext "TabLinienenden"
     sleep 2
     Kontext "Linienstil"
-    if Linienstil.Exists then Aendern.Click        '/// change style ///'
+    printlog "change style"
+    if Linienstil.Exists then Aendern.Click        
     sleep 1
     Kontext
     Active.SetPage TabLinienenden
@@ -238,14 +272,16 @@ testcase tiFormatLine
     sleep 1
     Liste.GetItemCount
     Liste.Select 3
-    Hinzufuegen.Click           '/// add style ///'
+    printlog "add style"
+    Hinzufuegen.Click           
     Kontext "NameDlg"
     NameDlg.OK
     
     Kontext
     Active.SetPage TabLinienenden
     Kontext "TabLinienenden"
-    Aendern.Click            '/// change style ///'
+    printlog "change style"
+    Aendern.Click            
     Kontext "Active"
     Printlog Active.GetText
     Active.OK
@@ -256,20 +292,21 @@ testcase tiFormatLine
     
     Kontext
     if active.GetRt=304 then
-     active.ok
-     Kontext "NameDlg"
-     Eingabefeld.SetText Eingabefeld.GetText + "1"
-     PrintLog "  Name inserted"
-     NameDlg.OK
+        active.ok
+        Kontext "NameDlg"
+        Eingabefeld.SetText Eingabefeld.GetText + "1"
+        PrintLog "  Name inserted"
+        NameDlg.OK
     endif
     if active.GetRt=304 then
-     active.ok
-     warnlog "still not a valid name :-("
+        active.ok
+        warnlog "still not a valid name :-("
     endif
     Kontext
     Active.SetPage TabLinienenden
     Kontext "TabLinienenden"
-    Loeschen.Click           '/// delete style ///'
+    printlog "delete style"
+    Loeschen.Click           
     Kontext "Active"
     Active.Yes
     
@@ -277,7 +314,8 @@ testcase tiFormatLine
     Active.SetPage TabLinienenden
     Kontext "TabLinienenden"
     sleep 1
-    Speichern.Click          '/// save style ///'
+    printlog "save style"
+    Speichern.Click          
     sleep 1
     Kontext "SpeichernDlg"
     sleep 1
@@ -288,12 +326,12 @@ testcase tiFormatLine
     sleep 2
     
     '///New part for line
-    'EditSelectAll     '/// Select all objects in document ///'
+    'EditSelectAll     printlog "Select all objects in document"
     'sleep 2
-    'hTypeKeys "<DELETE>"     '/// Delete objects ///'
+    'hTypeKeys "<DELETE>"     printlog "Delete objects"
     'sleep 2
     
-    '/// Create line to test shadow tabpage in line dialog
+    'printlog "Create line to test shadow tabpage in line dialog
     'kontext "Toolbar"
     'Kurven.Click
     'sleep 1
@@ -311,7 +349,8 @@ testcase tiFormatLine
     'Active.SetPage TabSchatten
     
    ' FormatLine.Cancel
-    Call hCloseDocument          '/// close document ///'
+    printlog "close document"
+    Call hCloseDocument
     
 endcase 'tiFormatLine
 '-------------------------------------------------------------------------------'
@@ -329,8 +368,9 @@ testcase tLineConnect
      QaErrorLog "tLineConnect ends because Asian languages are not fully supported."
      goto Endsub
     end if
-    
-    Call hNewDocument   '/// New Impress / Draw document ///'
+
+    printlog "New Impress / Draw document"
+    Call hNewDocument   
     Call sSelectEmptyLayout
     sleep 3
     kontext "GraphicObjectbar"
@@ -352,7 +392,7 @@ testcase tLineConnect
      end if
     endif
     
-    '/// Create 2 lines ///'
+    printlog "Create 2 lines"
     kontext "Toolbar"
     Kurven.Click
     sleep 1
@@ -376,7 +416,7 @@ testcase tLineConnect
     
     printlog "'" + (gApplication) +"'"
     
-    '/// Check the amount of objects ///'
+    printlog "Check the amount of objects"
     gMouseClick (10, 10)
     sleep 1
     EditSelectAll
@@ -400,12 +440,12 @@ testcase tLineConnect
         end if
     end if
     
-    '/// Connect the two objects selected ///'
+    printlog "Connect the two objects selected"
     hOpenContextMenu
     sleep 1
     hMenuSelectNr(13)
     sleep 1
-    '/// Check the amount of objects ///'
+    printlog "Check the amount of objects"
     gMouseClick (10, 10)
     sleep 1
     EditSelectAll
@@ -419,7 +459,7 @@ testcase tLineConnect
     value2 = left(StatusBarText,1)
     printlog "StatusBarText was: " + StatusBarText
     
-    '/// if same as the first value = wrong ///'
+    printlog "if same as the first value = wrong"
     if value1 = value2 then
      warnlog "Expected to find one object, but found " + value2 + " instead."
     endif
@@ -427,22 +467,22 @@ testcase tLineConnect
      warnlog "Connect was not successful. We should have one object, but have " + value2 + " instead."
     endif
     
-    '/// unmark the objects, thereafter mark them again ///'
+    printlog "unmark the objects, thereafter mark them again"
     gMouseClick (10, 10)
     sleep 1
     EditSelectAll
     sleep 1
-    '/// Break them from eachother ///'
+    printlog "Break them from eachother"
     hOpenContextMenu
     sleep 1
     hMenuSelectNr(11)
     sleep 1
-    '/// unmark the objects, thereafter mark them again ///'
+    printlog "unmark the objects, thereafter mark them again"
     gMouseClick (10, 10)
     sleep 1
     EditSelectAll
     sleep 1
-    '/// Check the amount of objects ///'
+    printlog "Check the amount of objects"
     if (gApplication = "IMPRESS") then
      StatusBarText = DocumentImpress.StatusGetText(DocumentImpress.StatusGetItemID(1))
     else
@@ -453,19 +493,19 @@ testcase tLineConnect
     
     printlog "StatusBarText was: " + StatusBarText
     
-    '/// if the same as any of the ones before: Wrong ///'
+    printlog "if the same as any of the ones before: Wrong"
     if (value3 = value1 OR value3 = value2) then
      warnlog "Expected to find three objects, but found " + value3 + " instead."
     endif
     
-    '/// if 3 objects, then everything is ok ///'
+    printlog "if 3 objects, then everything is ok"
     if value3 = 3 then
      printlog "Found three objects. Means the test was successful."
     else
      warnlog "Wrong value, expected three objects, but found " + value3 + "."
     endif
     
-    '/// Go through the different Corner-styles ///'
+    printlog "Go through the different Corner-styles"
     
     hOpenContextMenu
     sleep 1
@@ -496,7 +536,7 @@ testcase tLineConnect
     CornerStyle.Select cfirst
     TabLinie.Ok
     
-    '/// And a nice finish to make life a bit happier for anyone who looks at the test ///'
+    printlog "And a nice finish to make life a bit happier for anyone who looks at the test"
     kontext "Toolbar"
     Ellipsen.Click
     if (gApplication = "DRAW") then
@@ -525,9 +565,9 @@ testcase tLineConnect
     gMouseMove (48,43, 53,50)
     endif
     gMouseClick (10, 10)
-    '/// Close the document ///'
+    printlog "Close the document"
     hCloseDocument
-    '/// Endcase ///'
+    printlog "Endcase"
     
 endcase 'tiLineConnect
 '-------------------------------------------------------------------------------'
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index bd9cf36bb814..c10239e69775 100644
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -348,7 +348,7 @@ endcase 'tiToolsSpellcheckCheck_ChangeAll
 
 function delete_all_added_words(aWords)
 
-    '/// this function delete the words in sWords in all user dictionaries
+    'this function delete the words in sWords in all user dictionaries
 
     Dim iBookCounter as integer
     Dim iWordCounter as integer
@@ -396,7 +396,7 @@ end function 'delete_all_added_words
 
 function delete_word_from_dictionary(sWord as String, sDictionary as String)
 
-    '/// this function delete the words in sWords in all user dictionaries
+    'this function delete the words in sWords in all user dictionaries
 
     Dim iBookCounter as integer
     Dim iWordCounter as integer