CWS-TOOLING: integrate CWS automationdev300m93

14 files changed, 3022 insertions, 2752 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
diff --git a/testautomation/graphics/optional/includes/impress/i_headerfooter.inc b/testautomation/graphics/optional/includes/impress/i_headerfooter.inc
index 3e4c54551525..d69a6762f886 100644
--- a/testautomation/graphics/optional/includes/impress/i_headerfooter.inc
+++ b/testautomation/graphics/optional/includes/impress/i_headerfooter.inc
@@ -30,35 +30,31 @@
 '* short description : Tests the header-footer-function in Impress
 '*
 '*******************************************************************
-'*
-' #1 tiHeaderFooterSlide
-' #1 tiHeaderFooterNotesHandout
-'*
-'\*******************************************************************
 
-dim numbervalue1 as integer
-dim value2 as String
-dim value3 as String
+testcase tiHeaderFooterSlide
 
-'------------------------------------------------------------------------------
+    dim numbervalue1 as integer
+    dim value2 as String
+    dim value3 as String
 
-testcase tiHeaderFooterSlide
-    '/// This part checks the first Tabpage of the Header and Footer Dialog
-    
-    Call hNewDocument		'/// Open New document
+    printlog "This part checks the first Tabpage of the Header and Footer Dialog"
+
+    printlog "Open New document"
+    Call hNewDocument		
     kontext "drawimpress"
     try
-       ViewHeaderAndFooter          '/// View - Header And Footer
+        printlog "View - Header And Footer"
+        ViewHeaderAndFooter
        sleep(1)
     catch
-       warnlog " Could'nt open ViewHeaderAndFooter!" '/// Warnlog for not opening dialog
+       warnlog " Could'nt open ViewHeaderAndFooter!" 
     endcatch
     
     printlog " Testing TabHeaderFooterSlide."
     kontext "TabHeaderFooterSlide"
 
-    '/// Check Date And Time on first tab
-    if DateTime.Exists = TRUE AND DateTimeFixed.isVisible = TRUE then '/// Testing date and time checkbox
+    printlog "Testing date and time checkbox"
+    if DateTime.Exists = TRUE AND DateTimeFixed.isVisible = TRUE then 
         DateTime.UnCheck
         sleep(1)
         DateTime.Check
@@ -74,7 +70,7 @@ testcase tiHeaderFooterSlide
         warnlog "DateTime does not exist or is not visible."
     endif
     
-    '/// Checking if DateTime checkbox setting is remembered...
+    printlog "Checking if DateTime checkbox setting is remembered..."
     DateTime.Uncheck
     printlog " Date Time is unchecked now."
     Apply.Click
@@ -87,7 +83,7 @@ testcase tiHeaderFooterSlide
     endif
     DateTime.Check
 
-   '/// Check DateTimeFixed can be checked/unchecked
+   printlog "Check DateTimeFixed can be checked/unchecked"
     if DateTimeFixed.Exists = TRUE AND DateTimeFixed.isVisible = TRUE then
         DateTimeFixed.Check
         sleep(1)
@@ -102,7 +98,7 @@ testcase tiHeaderFooterSlide
         warnlog " DateTimeFixed doesnt exist or is not visible!"
     endif
 
-    '/// Can text be inserted in the "fixed"-field?
+    printlog "Can text be inserted in the fixed-field?"
     if DateTimeFixedText.exists = TRUE AND DateTimeFixedText.isVisible = TRUE then
         DateTimeFixedText.settext "lalala"
         
@@ -116,7 +112,7 @@ testcase tiHeaderFooterSlide
         warnlog " DateTimeFixedText doesnt exist or is not visible!"
     endif
       
-    '/// Checking if DateTimeFixed and Text setting is remembered...
+    printlog "Checking if DateTimeFixed and Text setting is remembered..."
     DateTime.Check
     DateTimeFixed.Check
     DateTimeFixedText.settext "lalala"
@@ -130,7 +126,7 @@ testcase tiHeaderFooterSlide
     endif
     DateTimeFixedText.settext ""
 
-    '/// Can I change to "Variable" and check it?
+    printlog "Can I change to Variable and check it?"
     if DateTimeVariable.exists = TRUE AND DateTimeVariable.isVisible = TRUE then
         DateTimeVariable.Check
         sleep(1)
@@ -145,7 +141,7 @@ testcase tiHeaderFooterSlide
         warnlog " DateTimeVariable doesnt exist or is not visible!"
     endif
     
-    '/// Is the Variable setting saved?
+    printlog "Is the Variable setting saved?"
     Apply.Click
     ViewHeaderAndFooter
     if DateTimeVariable.isChecked then
@@ -154,24 +150,30 @@ testcase tiHeaderFooterSlide
         warnlog " Variable setting does not get saved!"
     endif
 
-    '/// Checking DateTimeFormat box
+    printlog "Checking DateTimeFormat box"
     if DateTimeFormat.exists = TRUE AND DateTimeFormat.isVisible = TRUE then
-        numbervalue1 = DateTimeFormat.getitemcount     '/// Get the number of choices
+        printlog "Get the number of choices"
+        numbervalue1 = DateTimeFormat.getitemcount     
         printlog " DateTimeFormat equals: " + numbervalue1
-        value2 = DateTimeFormat.getseltext             '/// Get the text for the choosen entry
+        printlog "Get the text for the choosen entry"
+        value2 = DateTimeFormat.getseltext             
         printlog " Tries to get ", numbervalue1 & "."
-        DateTimeFormat.select ( numbervalue1 - 1 )     '/// Select the last entry
-        value3 = DateTimeFormat.getseltext             '/// Get the text for the last entry
+        printlog "Select the last entry"
+        DateTimeFormat.select ( numbervalue1 - 1 )
+        printlog "Get the text for the last entry"
+        value3 = DateTimeFormat.getseltext             
         printlog " DateTimeFormat is: " + value3
         
-        if value2 = value3 then 
-            errorlog " More options for Date should exist!"   '/// Check if the first and last are the same.
-            DateTimeFormat.select value2                   '/// Choose the original state
+        if value2 = value3 then
+            printlog "Check if the first and last are the same."
+            errorlog " More options for Date should exist!"
+            printlog "Choose the original state"
+            DateTimeFormat.select value2                   
         else
             printlog " DateTimeFormat box works."
         endif
         
-        '/// Checking if settings of DateTimeFormat box get saved
+        printlog "Checking if settings of DateTimeFormat box get saved"
         Apply. Click
         ViewHeaderAndFooter
         if DateTimeFormat.GetSelText = value3 then
@@ -184,23 +186,30 @@ testcase tiHeaderFooterSlide
         warnlog " DateTimeFormat doesnt exist or is not visible."
     endif
 
-    '/// Checking DateTimeLanguage box
+    printlog "Checking DateTimeLanguage box"
     if DateTimeLanguage.exists = TRUE AND DateTimeLanguage.isVisible = TRUE then
-        numbervalue1 = DateTimeLanguage.GetItemCount   '/// Get the number of choices 
-        DateTimeFormat.select 1                        '/// Choose the first entry 
-        value2 = DateTimeLanguage.GetSelText           '/// Get the text for the choosen entry 
-        DateTimeLanguage.select ( numbervalue1 - 1 )   '/// Select the last entry 
-        value3 = DateTimeLanguage.GetSelText           '/// Get the text for the last entry 
+        printlog "Get the number of choices "
+        numbervalue1 = DateTimeLanguage.GetItemCount
+        printlog "Choose the first entry "
+        DateTimeFormat.select 1
+        printlog "Get the text for the choosen entry "
+        value2 = DateTimeLanguage.GetSelText
+        printlog "Select the last entry "
+        DateTimeLanguage.select ( numbervalue1 - 1 )
+        printlog "Get the text for the last entry "
+        value3 = DateTimeLanguage.GetSelText           
         
         if value2 = value3 then 
-            errorlog " More options for Date should exist!"   '/// Check  if the first and last aare the same. 
-            DateTimeLanguage.select value2                 '/// Choose the original state 
+            errorlog " More options for Date should exist!"
+            printlog "Check  if the first and last are the same. "
+            printlog "Choose the original state "
+            DateTimeLanguage.select value2                 
             value3 = DateTimeLanguage.GetSelText
             else
                 printlog " DateTimeLanguage box works."
             endif
             
-        '/// Checking if language settings get saved
+        printlog "Checking if language settings get saved"
         Apply.Click
         ViewHeaderAndFooter
         if DateTimeLanguage.GetSelText = value3 then
@@ -213,7 +222,7 @@ testcase tiHeaderFooterSlide
         warnlog " DateTime doesnt exist or is not visible!"
     endif
 
-    '/// Checking Footer checkbox 
+    printlog "Checking Footer checkbox "
     if Footer.exists = TRUE AND Footer.isVisible = TRUE then
         Footer.Check
         sleep(1)
@@ -228,7 +237,7 @@ testcase tiHeaderFooterSlide
         warnlog " Footer checkbox doesnt exist or is not visible!"
     endif
     
-    '/// Checking if Footer setting gest saved
+    printlog "Checking if Footer setting gest saved"
     Footer.Uncheck
     Apply.Click
     ViewHeaderAndFooter
@@ -239,7 +248,7 @@ testcase tiHeaderFooterSlide
     endif
     Footer.Check
 
-    '/// Checking if text can be inserted in FooterFixedText 
+    printlog "Checking if text can be inserted in FooterFixedText "
     if FooterFixedText.exists = TRUE AND FooterFixedText.isVisible = TRUE then
         FooterFixedText.SetText "lalala"
         
@@ -253,7 +262,7 @@ testcase tiHeaderFooterSlide
         warnlog " Footer doesnt exist or is not visible!"
     endif
     
-    '/// Checking if Footer text gets saved.
+    printlog "Checking if Footer text gets saved."
     Apply.Click
     ViewHeaderAndFooter
     
@@ -265,7 +274,7 @@ testcase tiHeaderFooterSlide
     endif
     FooterFixedText.SetText ""
 
-   '/// Checking Slidenumber checkbox
+   printlog "Checking Slidenumber checkbox"
     if Donotshowonfirstslide.exists = TRUE AND Donotshowonfirstslide.isVisible = TRUE then
         Slidenumber.Check
         sleep(1)
@@ -279,7 +288,7 @@ testcase tiHeaderFooterSlide
         warnlog " Do not show on first slide doesnt exist or is not visible!"
     endif
     
-    '/// Checking if Slidenumber gets saved.
+    printlog "Checking if Slidenumber gets saved."
     Apply.Click
     ViewHeaderAndFooter
     
@@ -289,7 +298,7 @@ testcase tiHeaderFooterSlide
         warnlog " Slidenumber setting is not remembered!"
     endif
 
-    '/// Checking "Do not show on first slide" checkbox
+    printlog "Checking Do not show on first slide checkbox"
     if Donotshowonfirstslide.exists = TRUE AND Donotshowonfirstslide.isVisible = TRUE then
         Donotshowonfirstslide.UnCheck
         sleep(1)
@@ -303,7 +312,7 @@ testcase tiHeaderFooterSlide
         warnlog " Do not show on first slide doesnt exist or is not visible!"
     endif
 
-    '/// Checking if Do not show on first slide is saved.
+    printlog "Checking if Do not show on first slide is saved."
     Apply.Click
     ViewHeaderAndFooter
     
@@ -313,34 +322,41 @@ testcase tiHeaderFooterSlide
         warnlog " Do not show on first slide setting is not saved!"
     endif
         
-    '/// Closing dialog with cancel
+    printlog "Closing dialog with cancel"
     sleep 1
     TabHeaderFooterSlide.Cancel
     sleep 1
     kontext "drawimpress"
     sleep 1
 
-    '/// Close document 
+    printlog "Close document"
     Call hCloseDocument
 
-endcase
+endcase 'tiHeaderFooterSlide
 
 '----------------------------------------------------------------------------
 
 testcase tiHeaderFooterNotesHandout
-        '/// This part checks the second Tabpage of the Header and Footer Dialog for notes and handout
 
-    Call hNewDocument		'/// Open New document 
+    dim numbervalue1 as integer
+    dim value2 as String
+    dim value3 as String
+
+    printlog "This part checks the second Tabpage of the Header and Footer Dialog for notes and handout"
+
+    printlog "Open New document "
+    Call hNewDocument		
     kontext "drawimpress"
     try
-        ViewHeaderAndFooter          '/// View - Header And Footer 
+        printlog "View - Header And Footer "
+        ViewHeaderAndFooter          
         sleep(1)
     catch
-        warnlog " Could'nt open ViewHeaderAndFooter!" '/// Warnlog for not opening dialog
+        printlog "Warnlog for not opening dialog"
+        warnlog " Could'nt open ViewHeaderAndFooter!" 
     endcatch 'goto endcase
     kontext " TabHeaderFooterSlide"
     
-    '/// Change tabpage to HeaderFooterNotesHandout 
     printlog " Testing TabHeaderFooterNotesHandout."
     sleep 2
     kontext
@@ -348,7 +364,7 @@ testcase tiHeaderFooterNotesHandout
     sleep 2
     kontext "TabHeaderFooterNotesHandout"
     
-    '/// Checking Header checkbox 
+    printlog "Checking Header checkbox "
     if Header.exists = TRUE AND Header.isVisible = TRUE then
         Header.UnCheck
         sleep(1)
@@ -365,7 +381,7 @@ testcase tiHeaderFooterNotesHandout
         warnlog " Header doesnt exist or is not visible!"
     endif
     
-    '/// Checking if Header setting is saved.
+    printlog "Checking if Header setting is saved."
     Header.Uncheck
     ApplyToAll.Click
     ViewHeaderAndFooter
@@ -380,7 +396,7 @@ testcase tiHeaderFooterNotesHandout
         Header.Check
     endif
     
-    '/// Checking if header text can be inserted
+    printlog "Checking if header text can be inserted"
     if HeaderFixedText.exists = TRUE AND HeaderFixedText.isVisible = TRUE then
         HeaderFixedText.settext "lalala"
         sleep(1)
@@ -394,7 +410,7 @@ testcase tiHeaderFooterNotesHandout
         warnlog " HeaderFixedText doesnt exist or is not visible!"
     endif
     
-    '/// Checking if text is saved.
+    printlog "Checking if text is saved."
     ApplyToAll.Click
     ViewHeaderAndFooter
     kontext
@@ -407,7 +423,7 @@ testcase tiHeaderFooterNotesHandout
     endif
     HeaderFixedText.SetText ""
 
-    '/// Checking Date And Time checkbox
+    printlog "Checking Date And Time checkbox"
     if DateTime.exists = TRUE AND DateTime.isVisible = TRUE then
         DateTime.UnCheck
         sleep(1)
@@ -424,7 +440,7 @@ testcase tiHeaderFooterNotesHandout
         warnlog " DateTime doesnt exist or is not visible!"
     endif
     
-    '/// Checking if Date and Time setting is saved.
+    printlog "Checking if Date and Time setting is saved."
     DateTime.Uncheck
     ApplyToAll.Click
     ViewHeaderAndFooter
@@ -439,7 +455,7 @@ testcase tiHeaderFooterNotesHandout
     endif
     DateTime.Check
 
-    '/// Check DateTimeFixed can be checked/unchecked 
+    printlog "Check DateTimeFixed can be checked/unchecked "
     if DateTimeFixed.exists = TRUE AND DateTimeFixed.isVisible = TRUE then
     
         if DateTimeFixed.isChecked then 
@@ -464,7 +480,7 @@ testcase tiHeaderFooterNotesHandout
         warnlog " DateTimeFixed doesnt exist or is not visible!"
     endif
 
-    '/// Can text be inserted in the "fixed"-field? 
+    printlog "Can text be inserted in the fixed-field? "
     if DateTimeFixedText.exists = TRUE AND DateTimeFixedText.isVisible = TRUE then
         DateTimeFixedText.settext "lalala"
       
@@ -474,7 +490,7 @@ testcase tiHeaderFooterNotesHandout
             printlog " DateTimeFixedText works."
         endif
         
-        '/// Checking if DateTimeFixedText gets saved.
+        printlog "Checking if DateTimeFixedText gets saved."
         ApplyToAll.Click
         ViewHeaderAndFooter
         kontext
@@ -491,7 +507,7 @@ testcase tiHeaderFooterNotesHandout
         warnlog "DateTimeFixedText doesnt exist or is not visible"
     endif
 
-    '/// Can it be changed to "Variable" and checked? 
+    printlog "Can it be changed to Variable and checked? "
     if DateTimeVariable.exists = TRUE AND DateTimeVariable.isVisible = TRUE then
         DateTimeVariable.Check
         sleep(1)
@@ -502,7 +518,7 @@ testcase tiHeaderFooterNotesHandout
             warnlog " Something wrong with the DateTimeVariable-checkbox or DateTimeFormat is checked!"
         endif
       
-        '/// Checking if DateTimeVariable setting gets saved.
+        printlog "Checking if DateTimeVariable setting gets saved."
         ApplyToAll.Click
         ViewHeaderAndFooter
         kontext
@@ -519,25 +535,31 @@ testcase tiHeaderFooterNotesHandout
         warnlog " DateTimeVariable doesnt exist or is not visible"
     endif
    
-    '/// Checking format dropdown box
-    numbervalue1 = DateTimeFormat.getitemcount           '/// Get the number of choices 
+    printlog "Checking format dropdown box"
+    printlog "Get the number of choices "
+    numbervalue1 = DateTimeFormat.getitemcount           
     printlog " DateTimeFormat equals: " + numbervalue1
-    value2 = DateTimeFormat.getseltext             '/// Get the text for the choosen entry 
+    printlog "Get the text for the choosen entry "
+    value2 = DateTimeFormat.getseltext
     printlog " Tries to get ", numbervalue1
 
     if DateTimeFormat.exists = TRUE AND DateTimeFormat.isVisible = TRUE then
-        DateTimeFormat.select ( numbervalue1 - 1 )     '/// Select the last entry 
-        value3 = DateTimeFormat.getseltext             '/// Get the text for the last entry 
+        printlog "Select the last entry "
+        DateTimeFormat.select ( numbervalue1 - 1 )
+        printlog "Get the text for the last entry "
+        value3 = DateTimeFormat.getseltext             
         printlog " DateTimeFormat is: " + value3
         
-        if value2 = value3 then 
-            errorlog " More options for Date should exist."   '/// Check if the first and last are the same. 
-            DateTimeFormat.select value2                   '/// Choose the original state 
+        if value2 = value3 then
+             printlog "Check if the first and last are the same. "
+            errorlog " More options for Date should exist."
+            printlog "Choose the original state "
+            DateTimeFormat.select value2                   
         else
             printlog " DateTimeFormat works."
         endif
         
-        '/// Checking if DateTimeFormat setting gets saved.
+        printlog "Checking if DateTimeFormat setting gets saved."
         ApplyToAll.Click
         ViewHeaderAndFooter
         kontext
@@ -555,19 +577,25 @@ testcase tiHeaderFooterNotesHandout
     endif
    
     if DateTimeLanguage.exists = TRUE AND DateTimeLanguage.isVisible = TRUE then
-        numbervalue1 = DateTimeLanguage.getitemcount   '/// Get the number of choices 
-        DateTimeFormat.select 1                        '/// Choose the first entry 
-        value2 = DateTimeLanguage.getseltext           '/// Get the text for the choosen entry 
-        DateTimeLanguage.select ( numbervalue1 - 1 )   '/// Select the last entry 
-        value3 = DateTimeLanguage.getseltext           '/// Get the text for the last entry 
+        printlog "Get the number of choices "
+        numbervalue1 = DateTimeLanguage.getitemcount
+        printlog "Choose the first entry "
+        DateTimeFormat.select 1
+        printlog "Get the text for the choosen entry "
+        value2 = DateTimeLanguage.getseltext
+        printlog "Select the last entry "
+        DateTimeLanguage.select ( numbervalue1 - 1 )
+        printlog "Get the text for the last entry"
+        value3 = DateTimeLanguage.getseltext           
       
-        if value2 = value3 then 
-            errorlog " More options for Date should exist!"   '/// Check if the first and last are the same. 
+        if value2 = value3 then
+            printlog "Check if the first and last are the same. "
+            errorlog " More options for Date should exist!"   
         else
             printlog " Footer works."
         endif
         
-        '/// Checking if DateTimeLanguage setting gets saved.
+        printlog "Checking if DateTimeLanguage setting gets saved."
         ApplyToAll.Click
         ViewHeaderAndFooter
         kontext
@@ -583,7 +611,7 @@ testcase tiHeaderFooterNotesHandout
         warnlog " DateTimeLanguage does not exist!"
     endif
 
-        '/// Checking Footer checkbox. 
+        printlog "Checking Footer checkbox. "
         if Footer.exists = TRUE AND Footer.isVisible = TRUE then
             Footer.UnCheck
             sleep(1)
@@ -597,7 +625,7 @@ testcase tiHeaderFooterNotesHandout
             Footer.Check
         endif
         
-        '///Check if Footer setting is saved.
+        printlog "Check if Footer setting is saved."
         Footer.Uncheck
         ApplyToAll.Click
         ViewHeaderAndFooter
@@ -611,10 +639,8 @@ testcase tiHeaderFooterNotesHandout
             printlog " Footer is not checked."
         endif
         Footer.Check
-        
-
    
-    '/// Checking if Footer text can be inserted
+    printlog "Checking if Footer text can be inserted"
     if FooterFixedText.exists = TRUE AND FooterFixedText.isVisible = TRUE then
         FooterFixedText.SetText "lalala"
         sleep(1)
@@ -629,7 +655,7 @@ testcase tiHeaderFooterNotesHandout
         warnlog " FooterFixedText does not exists!"
     endif
     
-    '///Checking if Footer text is saved.
+    printlog "Checking if Footer text is saved."
     ApplyToAll.Click
     ViewHeaderAndFooter
     kontext
@@ -642,7 +668,7 @@ testcase tiHeaderFooterNotesHandout
         printlog " FooterFixedText gets saved."
     endif
     
-    '/// Checking Slidenumber checkbox
+    printlog "Checking Slidenumber checkbox"
     if Slidenumber.exists = TRUE AND Slidenumber.isVisible = TRUE then
         Slidenumber.UnCheck
         sleep(1)
@@ -653,7 +679,7 @@ testcase tiHeaderFooterNotesHandout
             Slidenumber.Check
         endif
         
-        '/// Checking if Slidenumber setting is saved.
+        printlog "Checking if Slidenumber setting is saved."
         ApplyToAll.Click
         ViewHeaderAndFooter
         kontext
@@ -670,16 +696,16 @@ testcase tiHeaderFooterNotesHandout
         warnlog " Slidenumber does'nt exist or is not visible!"
     endif
 
-    '/// Close dialog with cancel
+    printlog "Close dialog with cancel"
     sleep 1
     TabHeaderFooterNotesHandout.Cancel
     sleep 1
     kontext "drawimpress"
     sleep 1
 
-   '/// Close document 
+   printlog "Close document "
     Call hCloseDocument
 
-endcase
+endcase 'tiHeaderFooterNotesHandout
 
-'-------------------------------------------------------------------------------
+'-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine1.inc b/testautomation/graphics/optional/includes/impress/i_pengine1.inc
index 44f531c47fcd..ff4d2a035ef0 100644
--- a/testautomation/graphics/optional/includes/impress/i_pengine1.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine1.inc
@@ -30,20 +30,9 @@
 '* short description : Tests the Engine for Presentation
 '*
 '*******************************************************************
-'*
-' #1 tiPengineTabEntrance
-' #1 tiPengineTabEmphasis
-' #1 tiPengineTabExit
-' #1 tiPengineTabMotionPaths
-' #1 tiPengineSlideTransition
-' #1 tiPengineTabpageEntrance2
-' #1 tiPengineTabPageEmphasis2
-' #1 tiPengineTabPageExit2
-' #1 tiPengineTabPageMotionPaths2
-'*
-'\*******************************************************************
 
 testcase tiPengineTabEntrance
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -62,19 +51,19 @@ testcase tiPengineTabEntrance
     dim UsedEffect as string
     dim NewEffect as string
 
-'/// open application ///'
-Call hNewDocument
-'/// create textbox with text ///'
-Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-'/// Slide Show->Custom Animation... ///'
-SlideShowCustomAnimation
-   Kontext "Tasks"
-   '/// click button 'Add...' ///'
-   EffectAdd.click
-   '/// Dialog 'Custom Animation' comes up ///'
-   kontext
+    printlog "open application"
+    Call hNewDocument
+    printlog "create textbox with text"
+    Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
+    printlog "Slide Show->Custom Animation..."
+    SlideShowCustomAnimation
+    Kontext "Tasks"
+    printlog "click button 'Add...'"
+    EffectAdd.click
+    printlog "Dialog 'Custom Animation' comes up"
+    kontext
 
-   '/// Switch to TabPage: Entrance ///'
+   printlog "Switch to TabPage: Entrance"
    active.setPage(TabEntrance)
    kontext "TabEntrance"
    if TabEntrance.exists(5) then
@@ -183,7 +172,8 @@ SlideShowCustomAnimation
                  Printlog "Presentation didn't end. Error?"
               endif
               kontext "TabEntrance"
-              Effects.TypeKeys "<DOWN>", e '/// Select the next entry ///'
+              printlog "Select the next entry"
+              Effects.TypeKeys "<DOWN>", e 
               p = Effects.GetSelIndex
               If p = d Then e = i
           Next e
@@ -206,12 +196,12 @@ SlideShowCustomAnimation
       Next o
       kontext
 
-      '/// Switch to TabPage: Entrance ///'
+      printlog "Switch to TabPage: Entrance"
       active.setPage(TabEntrance)
       kontext "TabEntrance"
       if TabEntrance.exists(5) then
          Effects.Select 4
-         '/// Close dialog 'Custom Animation' with 'OK' ///'
+         printlog "Close dialog 'Custom Animation' with 'OK'"
          TabEntrance.OK
       else
          warnlog "Error when switching Tab"
@@ -223,15 +213,16 @@ SlideShowCustomAnimation
    endif
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
+endcase 'tiPengineTabEntrance
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+'-------------------------------------------------------------------------------
 
 testcase tiPengineTabEmphasis
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -250,19 +241,19 @@ testcase tiPengineTabEmphasis
     dim UsedEffect as string
     dim NewEffect as string
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create textbox with text ///'
+    printlog "create textbox with text"
       Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-      '/// Slide Show->Custom Animation... ///'
+      printlog "Slide Show->Custom Animation..."
       SlideShowCustomAnimation
       Kontext "Tasks"
-      '/// click button 'Add...' ///'
+      printlog "click button 'Add...'"
       EffectAdd.click
-      '/// Dialog 'Custom Animation' comes up ///'
+      printlog "Dialog 'Custom Animation' comes up"
       kontext
 
-      '/// Switch to TabPage: Emphasis ///'
+      printlog "Switch to TabPage: Emphasis"
       kontext
       active.setPage(TabEmphasis)
       kontext "TabEmphasis"
@@ -347,11 +338,12 @@ testcase tiPengineTabEmphasis
                  else
                     Printlog "Presentation didn't end. Error?"
                  endif
-                 '/// Switch to TabPage: Emphasis ///'
+                 printlog "Switch to TabPage: Emphasis"
                  kontext
                  active.setPage(TabEmphasis)
                  kontext "TabEmphasis"
-                 Effects.TypeKeys "<DOWN>", e + 1 '/// Select the next entry ///'
+                 printlog "Select the next entry"
+                 Effects.TypeKeys "<DOWN>", e + 1 
                   p = Effects.GetSelIndex
                   If p = d Then e = i
              Next e
@@ -375,12 +367,12 @@ testcase tiPengineTabEmphasis
       endif
       kontext
 
-      '/// Switch to TabPage: Entrance ///'
+      printlog "Switch to TabPage: Entrance"
       active.setPage(TabEntrance)
       kontext "TabEntrance"
       if TabEntrance.exists(5) then
          Effects.Select 4
-         '/// Close dialog 'Custom Animation' with 'OK' ///'
+         printlog "Close dialog 'Custom Animation' with 'OK'"
          TabEntrance.OK
       else
          warnlog "Error when switching Tab"
@@ -388,15 +380,16 @@ testcase tiPengineTabEmphasis
       bError = false
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
+endcase 'tiPengineTabEmphasis
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+'-------------------------------------------------------------------------------
 
 testcase tiPengineTabExit
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -415,19 +408,19 @@ testcase tiPengineTabExit
     dim UsedEffect as string
     dim NewEffect as string
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create textbox with text ///'
+    printlog "create textbox with text"
       Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-      '/// Slide Show->Custom Animation... ///'
+      printlog "Slide Show->Custom Animation..."
       SlideShowCustomAnimation
       Kontext "Tasks"
-      '/// click button 'Add...' ///'
+      printlog "click button 'Add...'"
       EffectAdd.click
-      '/// Dialog 'Custom Animation' comes up ///'
+      printlog "Dialog 'Custom Animation' comes up"
       kontext
 
-      '/// Switch to TabPage: Exit ///'
+      printlog "Switch to TabPage: Exit"
       active.setPage(TabExit)
       kontext "TabExit"
       if TabExit.exists(5) then
@@ -509,10 +502,11 @@ testcase tiPengineTabExit
                     Printlog "Presentation didn't end. Error?"
                  endif
                  kontext
-                 '/// Switch to TabPage: Exit ///'
+                 printlog "Switch to TabPage: Exit"
                  active.setPage(TabExit)
                  kontext "TabExit"
-                 Effects.TypeKeys "<DOWN>", e + 1 '/// Select the next entry ///'
+                 printlog "Select the next entry"
+                 Effects.TypeKeys "<DOWN>", e + 1 
                  p = Effects.GetSelIndex
                  If p = d Then e = i 'p > 2 AND
              Next e
@@ -529,12 +523,12 @@ testcase tiPengineTabExit
       endif
       kontext
       
-      '/// Switch to TabPage: Entrance ///'
+      printlog "Switch to TabPage: Entrance"
       active.setPage(TabEntrance)
       kontext "TabEntrance"
       if TabEntrance.exists(5) then
          Effects.Select 4
-         '/// Close dialog 'Custom Animation' with 'OK' ///'
+         printlog "Close dialog 'Custom Animation' with 'OK'"
          TabEntrance.OK
       else
          warnlog "Error when switching Tab"
@@ -542,15 +536,17 @@ testcase tiPengineTabExit
       bError = false
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+endcase 'tiPengineTabExit
+
+'-------------------------------------------------------------------------------
 
 testcase tiPengineTabMotionPaths
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -569,19 +565,19 @@ testcase tiPengineTabMotionPaths
     dim UsedEffect as string
     dim NewEffect as string
     
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create textbox with text ///'
+    printlog "create textbox with text"
       Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-      '/// Slide Show->Custom Animation... ///'
+      printlog "Slide Show->Custom Animation..."
       SlideShowCustomAnimation
       Kontext "Tasks"
-      '/// click button 'Add...' ///'
+      printlog "click button 'Add...'"
       EffectAdd.click
-      '/// Dialog 'Custom Animation' comes up ///'
+      printlog "Dialog 'Custom Animation' comes up"
       kontext
       
-      '/// Switch to TabPage: Motion Paths ///'
+      printlog "Switch to TabPage: Motion Paths"
       active.setPage(TabMotionPaths)
       kontext "TabMotionPaths"
       if TabMotionPaths.exists(5) then
@@ -671,10 +667,11 @@ testcase tiPengineTabMotionPaths
                     Printlog "Presentation didn't end. Error?"
                  endif
                  kontext
-                 '/// Switch to TabPage: Motion Paths ///'
+                 printlog "Switch to TabPage: Motion Paths"
                  active.setPage(TabMotionPaths)
                  kontext "TabMotionPaths"
-                 Effects.TypeKeys "<DOWN>", e + 1 '/// Select the next entry ///'
+                 Effects.TypeKeys "<DOWN>", e + 1
+                 printlog "Select the next entry"
 '                 if p = 2 then Effects.TypeKeys "<DOWN>"
                   p = Effects.GetSelIndex
                   If p = d Then e = i 'p > 2 AND
@@ -691,12 +688,12 @@ testcase tiPengineTabMotionPaths
       endif
       kontext
 
-      '/// Switch to TabPage: Entrance ///'
+      printlog "Switch to TabPage: Entrance"
       active.setPage(TabEntrance)
       kontext "TabEntrance"
       if TabEntrance.exists(5) then
          Effects.Select 4
-         '/// Close dialog 'Custom Animation' with 'OK' ///'
+         printlog "Close dialog 'Custom Animation' with 'OK'"
          TabEntrance.OK
       else
          warnlog "Error when switching Tab"
@@ -704,15 +701,16 @@ testcase tiPengineTabMotionPaths
       bError = false
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
+endcase 'tiPengineTabMotionPaths
 
 '--------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tiPengineSlideTransition
+
     dim a as integer
     dim b as integer
     dim i as integer
@@ -720,31 +718,31 @@ testcase tiPengineSlideTransition
     dim iCount as integer
     dim Soundposition as integer
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     sleep 1
-    '/// Insert a second slide ///'
+    printlog "Insert a second slide"
     InsertSlide
     sleep 2
-    hTypekeys "<Pagedown>"
+    hTypeKeys "<Pagedown>"
     sleep 2
-    '/// create textframe with quotes; Simple: 39; Double: 34; ///'
+    printlog "create textframe with quotes; Simple: 39; Double: 34;"
     hTextrahmenErstellen ( "Hallo",20,20,60,30)
-    '/// Insert a third slide ///'
+    printlog "Insert a third slide"
     InsertSlide
     sleep 2
     hTypekeys "<Pagedown>"
     sleep 2
-    '/// Slide Show->Slide Transition ///'
+    printlog "Slide Show->Slide Transition"
     SlideShowSlideTransition
     sleep 2
-    '/// The 'Slide Transition' in the right 'Tasks' Pane has to come up ///'
+    printlog "The 'Slide Transition' in the right 'Tasks' Pane has to come up"
     Kontext "Tasks"
-        '/// Select every entry in the Listbox 'Apply to Selected Slides' ///'
-        '/// Then select the next Speed for Transition and retest all the effects ///'
-        '/// Redo until all effects has been tested with all speeds ///'
+        printlog "Select every entry in the Listbox 'Apply to Selected Slides'"
+        printlog "Then select the next Speed for Transition and retest all the effects"
+        printlog "Redo until all effects has been tested with all speeds"
         lala = TransitionApplyToSelectedSlide.GetItemCount
         Printlog "Count of effects : " + TransitionApplyToSelectedSlide.GetItemCount
         Printlog "Count of Speeds  : " + TransitionSpeed.GetItemCount
@@ -759,7 +757,7 @@ testcase tiPengineSlideTransition
             Next iCount
         Next b
         Printlog "Count of Sounds  : " + TransitionSound.GetItemCount
-        '/// One Entry of the Listbox 'Sound' is 'Other sound...', select it ///'
+        printlog "One Entry of the Listbox 'Sound' is 'Other sound...', select it"
 '        iCount = TransitionSound.GetItemCount
         TransitionSound.TypeKeys "<HOME>"
         i = 0
@@ -770,11 +768,11 @@ testcase tiPengineSlideTransition
             Soundposition = TransitionSound.GetSelIndex
             kontext "OeffnenDlg"
             if (OeffnenDlg.Exists (5)) then
-               '/// Read all entries in Listbox 'File type' ///'
+               printlog "Read all entries in Listbox 'File type'"
                for i = 1 to Dateityp.getItemCount
                    printlog "" + i + ":" + Dateityp.getItemText(i)
                next i
-               '/// cancel dialog 'Open' ///'
+               printlog "cancel dialog 'Open'"
                sleep 1
                OeffnenDlg.cancel
                kontext "Tasks"
@@ -792,21 +790,21 @@ testcase tiPengineSlideTransition
         sleep 5
         kontext "Tasks"
 
-        '/// check checkbox 'Automatically after' ///'
+        printlog "check checkbox 'Automatically after'"
         TransitionAutomaticallyAfter.Check
         sleep 5
-        '/// press key 'Page Up' in box ///'
+        printlog "press key 'Page Up' in box"
         TransitionAutomaticallyAfterTime.TypeKeys "<PageUp>"
         sleep 5
-        '/// check the standard checkbox 'On mouse click' ///'
+        printlog "check the standard checkbox 'On mouse click'"
         TransitionOnMouseClick.Check
         sleep 5
-        '/// press button 'Apply to All Slides' ///'
+        printlog "press button 'Apply to All Slides'"
         TransitionApplyToAllSlides.Click
         sleep 5
-        '/// press button 'Play' ///'
+        printlog "press button 'Play'"
         TransitionPlay.Click
-        '/// press button 'Slide Show' ///'
+        printlog "press button 'Slide Show'"
         sleep (10)
         TransitionSlideShow.Click
         sleep (3)
@@ -827,17 +825,17 @@ testcase tiPengineSlideTransition
         endif
         kontext "Tasks"
 
-        '/// uncheck and check Checkbox 'Automatic Preview' ///'
-        '/// default is checked ///'
+        printlog "uncheck and check Checkbox 'Automatic Preview'"
+        printlog "default is checked"
         if (NOT TransitionAutomaticPreview.IsChecked) then
             warnlog "Impress:Tasks Pane:Slide Transition: Automatic preview has to be checked by default, wasn't!"
         endif
         TransitionAutomaticPreview.UnCheck
         sleep 1
         TransitionAutomaticPreview.Check
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tiPengineSlideTransition
 
 'testcase
 ' Two different objects for two different effects. Does it work?
@@ -849,9 +847,10 @@ endcase
 ' Save file, close, open again and see if everything is as it were. (Random effects)
 'Endcase
 
-'########################################################################
+'-------------------------------------------------------------------------------
 
 testcase tiPengineTabpageEntrance2
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -868,21 +867,21 @@ testcase tiPengineTabpageEntrance2
     dim StartName1 as string
     dim PropertyName1 as string
 
-'/// open application ///'
-Call hNewDocument
-'/// create textbox with text ///'
-Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-'/// Slide Show->Custom Animation... ///'
-SlideShowCustomAnimation
-   Kontext "Tasks"
-   '/// Uncheck AutomaticPreview ///'
-   EffectAutomaticPreview.UnCheck
-   '/// click button 'Add...' ///'
-   EffectAdd.click
-   '/// Dialog 'Custom Animation' comes up ///'
-   kontext
+    printlog "open application"
+    Call hNewDocument
+    printlog "create textbox with text"
+    Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
+    printlog "Slide Show->Custom Animation..."
+    SlideShowCustomAnimation
+    Kontext "Tasks"
+    printlog "Uncheck AutomaticPreview"
+    EffectAutomaticPreview.UnCheck
+    printlog "click button 'Add...'"
+    EffectAdd.click
+    printlog "Dialog 'Custom Animation' comes up"
+    kontext
    
-   '/// Switch to TabPage: Entrance ///'
+   printlog "Switch to TabPage: Entrance"
    active.setPage(TabEntrance)
    kontext "TabEntrance"
    if TabEntrance.exists(5) then
@@ -927,7 +926,8 @@ SlideShowCustomAnimation
                  Printlog "Presentation didn't end. Error?"
               endif
               kontext "TabEntrance"
-              Effects.TypeKeys "<DOWN>", e '/// Select the next entry ///'
+              printlog "Select the next entry"
+              Effects.TypeKeys "<DOWN>", e 
               p = Effects.GetSelIndex
               If p = d Then e = i
           Next e
@@ -945,12 +945,12 @@ SlideShowCustomAnimation
       Next o
 
       kontext
-      '/// Switch to TabPage: Entrance ///'
+      printlog "Switch to TabPage: Entrance"
       active.setPage(TabEntrance)
       kontext "TabEntrance"
       if TabEntrance.exists(5) then
          Effects.Select 4
-         '/// Close dialog 'Custom Animation' with 'OK' ///'
+         printlog "Close dialog 'Custom Animation' with 'OK'"
          TabEntrance.OK
       else
          warnlog "Error when switching Tab"
@@ -962,15 +962,16 @@ SlideShowCustomAnimation
    endif
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
+endcase 'tiPengineTabpageEntrance2
 
 '------------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tiPengineTabPageEmphasis2
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -987,21 +988,21 @@ testcase tiPengineTabPageEmphasis2
     dim StartName1 as string
     dim PropertyName1 as string
 
-'/// open application ///'
-Call hNewDocument
-'/// create textbox with text ///'
-Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-'/// Slide Show->Custom Animation... ///'
-SlideShowCustomAnimation
+    printlog "open application"
+    Call hNewDocument
+    printlog "create textbox with text"
+    Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
+    printlog "Slide Show->Custom Animation..."
+    SlideShowCustomAnimation
    Kontext "Tasks"
-   '/// Uncheck AutomaticPreview ///'
+   printlog "Uncheck AutomaticPreview"
    EffectAutomaticPreview.UnCheck
-   '/// click button 'Add...' ///'
+   printlog "click button 'Add...'"
    EffectAdd.click
-   '/// Dialog 'Custom Animation' comes up ///'
+   printlog "Dialog 'Custom Animation' comes up"
    kontext
 
-      '/// Switch to TabPage: Emphasis ///'
+      printlog "Switch to TabPage: Emphasis"
       kontext
       active.setPage(TabEmphasis)
       kontext "TabEmphasis"
@@ -1049,7 +1050,8 @@ SlideShowCustomAnimation
                  active.setPage(TabEmphasis)
                  Printlog "Testing effects in - TabEmphasis"
                  kontext "TabEmphasis"
-                 Effects.TypeKeys "<DOWN>", e + 1 '/// Select the next entry ///'
+                 printlog "Select the next entry"
+                 Effects.TypeKeys "<DOWN>", e + 1 
                  p = Effects.GetSelIndex
                  If p = d Then e = i 'p > 2 AND
              Next e
@@ -1074,12 +1076,12 @@ SlideShowCustomAnimation
       endif
 
       kontext
-      '/// Switch to TabPage: Entrance ///'
+      printlog "Switch to TabPage: Entrance"
       active.setPage(TabEntrance)
       kontext "TabEntrance"
       if TabEntrance.exists(5) then
          Effects.Select 4
-         '/// Close dialog 'Custom Animation' with 'OK' ///'
+         printlog "Close dialog 'Custom Animation' with 'OK'"
          TabEntrance.OK
       else
          warnlog "Error when switching Tab"
@@ -1087,15 +1089,16 @@ SlideShowCustomAnimation
       bError = false
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
+endcase 'tiPengineTabPageEmphasis2
 
 '------------------------------------------------------------------------------------
 
 testcase tiPengineTabPageExit2
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -1112,21 +1115,21 @@ testcase tiPengineTabPageExit2
     dim StartName1 as string
     dim PropertyName1 as string
 
-'/// open application ///'
+printlog "open application"
 Call hNewDocument
-'/// create textbox with text ///'
+printlog "create textbox with text"
 Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-'/// Slide Show->Custom Animation... ///'
+printlog "Slide Show->Custom Animation..."
 SlideShowCustomAnimation
    Kontext "Tasks"
-   '/// Uncheck AutomaticPreview ///'
+   printlog "Uncheck AutomaticPreview"
    EffectAutomaticPreview.UnCheck
-   '/// click button 'Add...' ///'
+   printlog "click button 'Add...'"
    EffectAdd.click
-   '/// Dialog 'Custom Animation' comes up ///'
+   printlog "Dialog 'Custom Animation' comes up"
    kontext
  
-   '/// Switch to TabPage: Exit ///'
+   printlog "Switch to TabPage: Exit"
    active.setPage(TabExit)
    kontext "TabExit"
    if TabExit.exists(5) then
@@ -1178,15 +1181,16 @@ SlideShowCustomAnimation
                   Printlog "Presentation didn't end. Error?"
                endif
                kontext
-               '/// Switch to TabPage: Exit ///'
+               printlog "Switch to TabPage: Exit"
                active.setPage(TabExit)
                kontext "TabExit"
-               Effects.TypeKeys "<DOWN>", e + 1 '/// Select the next entry ///'
+               printlog "Select the next entry"
+               Effects.TypeKeys "<DOWN>", e + 1 
                p = Effects.GetSelIndex
                If p = d Then e = i 'p > 2 AND
            Next e
            kontext
-           '/// Switch to TabPage: Exit ///'
+           printlog "Switch to TabPage: Exit"
            active.setPage(TabExit)
            kontext "TabExit"
            e = 0
@@ -1208,12 +1212,12 @@ SlideShowCustomAnimation
    endif
 
    kontext
-   '/// Switch to TabPage: Entrance ///'
+   printlog "Switch to TabPage: Entrance"
    active.setPage(TabEntrance)
    kontext "TabEntrance"
    if TabEntrance.exists(5) then
       Effects.Select 4
-      '/// Close dialog 'Custom Animation' with 'OK' ///'
+      printlog "Close dialog 'Custom Animation' with 'OK'"
       TabEntrance.OK
    else
       warnlog "Error when switching Tab"
@@ -1221,15 +1225,16 @@ SlideShowCustomAnimation
    bError = false
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
+endcase 'tiPengineTabPageExit2
 
 '--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tiPengineTabPageMotionPaths2
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -1246,21 +1251,21 @@ testcase tiPengineTabPageMotionPaths2
     dim StartName1 as string
     dim PropertyName1 as string
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create textbox with text ///'
+    printlog "create textbox with text"
     Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-    '/// Slide Show->Custom Animation... ///'
+    printlog "Slide Show->Custom Animation..."
     SlideShowCustomAnimation
       Kontext "Tasks"
-      '/// Uncheck AutomaticPreview ///'
+      printlog "Uncheck AutomaticPreview"
       EffectAutomaticPreview.UnCheck
-      '/// click button 'Add...' ///'
+      printlog "click button 'Add...'"
       EffectAdd.click
-      '/// Dialog 'Custom Animation' comes up ///'
+      printlog "Dialog 'Custom Animation' comes up"
       kontext
 
-      '/// Switch to TabPage: Motion Paths ///'
+      printlog "Switch to TabPage: Motion Paths"
       active.setPage(TabMotionPaths)
       kontext "TabMotionPaths"
       if TabMotionPaths.exists(5) then
@@ -1302,15 +1307,16 @@ testcase tiPengineTabPageMotionPaths2
                     Printlog "Presentation didn't end. Error?"
                  endif
                  kontext
-                 '/// Switch to TabPage: Motion Paths ///'
+                 printlog "Switch to TabPage: Motion Paths"
                  active.setPage(TabMotionPaths)
                  kontext "TabMotionPaths"
-                 Effects.TypeKeys "<DOWN>", e + 1 '/// Select the next entry ///'
+                 printlog "Select the next entry"
+                 Effects.TypeKeys "<DOWN>", e + 1 
                   p = Effects.GetSelIndex
                   If p = d Then e = i 'p > 2 AND
              Next e
              kontext
-             '/// Switch to TabPage: Motion Paths ///'
+             printlog "Switch to TabPage: Motion Paths"
              active.setPage(TabMotionPaths)
              kontext "TabMotionPaths"
 
@@ -1332,12 +1338,12 @@ testcase tiPengineTabPageMotionPaths2
          warnlog "Impress:Tasks Pane:Custom Animation:TabMotionPaths tabPage doesn't work."
       endif
       kontext
-      '/// Switch to TabPage: Entrance ///'
+      printlog "Switch to TabPage: Entrance"
       active.setPage(TabEntrance)
       kontext "TabEntrance"
       if TabEntrance.exists(5) then
          Effects.Select 4
-         '/// Close dialog 'Custom Animation' with 'OK' ///'
+         printlog "Close dialog 'Custom Animation' with 'OK'"
          TabEntrance.OK
       else
          warnlog "Error when switching Tab"
@@ -1345,12 +1351,10 @@ testcase tiPengineTabPageMotionPaths2
       bError = false
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
+endcase 'tiPengineTabPageMotionPaths2
 
+'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
index f1fa908cf7b7..56d15f6eee37 100644
--- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
@@ -30,48 +30,41 @@
 '* short description : Tests the Presentation-Engines effects
 '*
 '*******************************************************************
-'*
-' #1 tiPengineAnimationEffectsPreview
-' #1 tiPengineAnimationEffectsOptions
-' #1 tiPengineAllShapesAndEffects
-' #1 tiPengine2ObjectsGetsEffects
-'*
-'\*******************************************************************
 
 testcase tiPengineAnimationEffectsPreview
     dim bError as boolean
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create textbox with text ///'
+    printlog "create textbox with text"
     Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-    '/// Slide Show->Custom Animation... ///'
+    printlog "Slide Show->Custom Animation..."
     SlideShowCustomAnimation
-        Kontext "Tasks"
-        '/// click button 'Add...' ///'
-        EffectAdd.click
-        '/// Dialog 'Custom Animation' comes up ///'
-        kontext
-        '/// Switch to TabPage: Entrance ///'
-        active.setPage(TabEntrance)
-        kontext "TabEntrance"
-        if TabEntrance.exists(5) then
-           DialogTest(TabEntrance)
-           TestAnimations
-           '/// Switch to TabPage: Emphasis ///'
-           kontext
-           active.setPage(TabEmphasis)
-           kontext "TabEmphasis"
-              if TabEmphasis.exists(5) then
-                 DialogTest(TabEmphasis)
-                 TestAnimations
-              else
-                 bError = true
-                 warnlog "Impress:Tasks Pane:Custom Animation:TabEmphasis tabPage doesn't work."
-              endif
-           kontext
-
-           '/// Switch to TabPage: Exit ///'
+    Kontext "Tasks"
+    printlog "click button 'Add...'"
+    EffectAdd.click
+    printlog "Dialog 'Custom Animation' comes up"
+    kontext
+    printlog "Switch to TabPage: Entrance"
+    active.setPage(TabEntrance)
+    kontext "TabEntrance"
+    if TabEntrance.exists(5) then
+       DialogTest(TabEntrance)
+       TestAnimations
+       printlog "Switch to TabPage: Emphasis"
+       kontext
+       active.setPage(TabEmphasis)
+       kontext "TabEmphasis"
+          if TabEmphasis.exists(5) then
+             DialogTest(TabEmphasis)
+             TestAnimations
+          else
+             bError = true
+             warnlog "Impress:Tasks Pane:Custom Animation:TabEmphasis tabPage doesn't work."
+          endif
+       kontext
+
+           printlog "Switch to TabPage: Exit"
            active.setPage(TabExit)
            kontext "TabExit"
               if TabExit.exists(5) then
@@ -83,7 +76,7 @@ testcase tiPengineAnimationEffectsPreview
               endif
            kontext
 
-           '/// Switch to TabPage: Motion Paths ///'
+           printlog "Switch to TabPage: Motion Paths"
            active.setPage(TabMotionPaths)
            kontext "TabMotionPaths"
               if TabMotionPaths.exists(5) then
@@ -95,12 +88,12 @@ testcase tiPengineAnimationEffectsPreview
               endif
            kontext
 
-           '/// Switch to TabPage: Entrance ///'
+           printlog "Switch to TabPage: Entrance"
            active.setPage(TabEntrance)
            kontext "TabEntrance"
            if TabEntrance.exists(5) then
               Effects.Select 4
-              '/// Close dialog 'Custom Animation' with 'OK' ///'
+              printlog "Close dialog 'Custom Animation' with 'OK'"
               TabEntrance.OK
            else
               warnlog "Error when switching Tab"
@@ -112,12 +105,12 @@ testcase tiPengineAnimationEffectsPreview
         endif
         Kontext "Tasks"
         if (NOT bError) then
-            '/// click button 'Change...' ///'
+            printlog "click button 'Change...'"
             EffectChange.click
-            '/// Dialog 'Custom Animation' comes up ///'
+            printlog "Dialog 'Custom Animation' comes up"
             kontext
 
-            '/// Switch to TabPage: Entrance ///'
+            printlog "Switch to TabPage: Entrance"
             active.setPage(TabEntrance)
             kontext "TabEntrance"
             if (NOT TabEntrance.exists(5)) then
@@ -129,7 +122,7 @@ testcase tiPengineAnimationEffectsPreview
             if EffectProperty.IsVisible then
                 EffectProperty.GetItemCount
             endif
-            '/// CLick on button '...' (Options) ///'
+            printlog "CLick on button '...' (Options)"
             EffectOptions.Click
             kontext "TabEffect"
             if TabEffect.Exists(5) then
@@ -137,7 +130,7 @@ testcase tiPengineAnimationEffectsPreview
                 Sound.GetItemCount
                 AfterAnimation.GetItemCount
 
-                '/// switch to TabPage 'Timing' ///'
+                printlog "switch to TabPage 'Timing'"
                 Kontext
                 Active.SetPage TabTiming
                 kontext "TabTiming"
@@ -155,7 +148,7 @@ testcase tiPengineAnimationEffectsPreview
                     warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: Timing TabPage didn't work."
                 endif
 
-                '/// switch to TabPage 'Timing' ///'
+                printlog "switch to TabPage 'Timing'"
                 Kontext
                 active.setPage TabTextAnimation
                 kontext "TabTextAnimation"
@@ -193,17 +186,18 @@ testcase tiPengineAnimationEffectsPreview
             sleep (2)
             kontext "Tasks"
             EffectAutomaticPreview.Check
-            '/// click button 'Remove' ///'
+            printlog "click button 'Remove'"
             EffectRemove.Click
         endif
         sleep (2)
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
 endcase 'tiPengineAnimationEffectsPreview
 
 '------------------------------------------------------------------------------
 
 testcase tiPengineAnimationEffectsOptions
+
     dim bError as boolean
     dim e as integer
     dim d as integer
@@ -222,28 +216,28 @@ testcase tiPengineAnimationEffectsOptions
     dim StartName1 as string
     dim PropertyName1 as string
 
-'/// open application ///'
-Call hNewDocument
-'/// create textbox with text ///'
-Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
-'/// Slide Show->Custom Animation... ///'
-SlideShowCustomAnimation
-   '/// Dialog 'Custom Animation' comes up ///'
-   Kontext "Tasks"
-   '/// Click button 'Add...' to add an effect to the text ///'
-   EffectAdd.click
-   kontext
-   '/// Switch to TabPage: Entrance ///'
-   active.setPage(TabEntrance)
-   kontext "TabEntrance"
-   if TabEntrance.exists(5) then
+    printlog "open application"
+    Call hNewDocument
+    printlog "create textbox with text"
+    Call hTextrahmenErstellen ("Test text to test text effects", 35, 35, 70, 70 )
+    printlog "Slide Show->Custom Animation..."
+    SlideShowCustomAnimation
+    printlog "Dialog 'Custom Animation' comes up"
+    Kontext "Tasks"
+    printlog "Click button 'Add...' to add an effect to the text"
+    EffectAdd.click
+    kontext
+    printlog "Switch to TabPage: Entrance"
+    active.setPage(TabEntrance)
+    kontext "TabEntrance"
+    if TabEntrance.exists(5) then
       AutomaticPreview.UnCheck
       Printlog "Testing effects in - TabEntrance"
       i = Effects.GetItemCount
       p = 7555
       Effects.TypeKeys "<HOME DOWN>"
       Randomize
-      '/// Choose ten random effects, and test them. ///'
+      printlog "Choose ten random effects, and test them."
       For e = 1 to 10
           randomize
           for y = 1 to 1
@@ -270,7 +264,7 @@ SlideShowCustomAnimation
                 Warnlog "Something wrong when exiting Impress:Tasks Pane:Custom Animation: ... (options)"
              endif
              kontext "TabEntrance"
-             '/// Select the next entry ///'
+             printlog "Select the next entry"
 	     Effects.TypeKeys "<DOWN>", e
              p = Effects.GetSelIndex
              If p = d Then e = i
@@ -300,27 +294,28 @@ SlideShowCustomAnimation
    endif
    kontext "Tasks"
    EffectAutomaticPreview.Check
-   '/// click button 'Remove' ///'
+   printlog "click button 'Remove'"
    EffectRemove.Click
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
 endcase 'tiPengineAnimationEffectsOptions
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------
+'-------------------------------------------------------------------------------
 
 testcase tiPengineAllShapesAndEffects
-   dim sFileName as string
 
-'/// the Presentation-Engine consists of showing the presentation, with all it's effects. ///'
+    dim sFileName as string
 
-    '/// Create a new presentation. ///'
+    printlog "the Presentation-Engine consists of showing the presentation, with all it's effects."
+
+    printlog "Create a new presentation."
     Call hNewDocument
     Sleep (1)
 
-    '/// Open the test-file. ///'
+    printlog "Open the test-file."
     Call hFileOpen (gTesttoolpath + "graphics\required\input\allshapes2.odp") 'effects.odp")
     
-    '/// Start the slideshow. ///'
+    printlog "Start the slideshow."
     Call hTypeKeys "<F5>"
     sleep (10)
     kontext "DocumentPresentation"
@@ -339,14 +334,14 @@ testcase tiPengineAllShapesAndEffects
     Call hCloseDocument
 
     sleep (1)
-    '/// Open the test-file. ///'
+    printlog "Open the test-file."
     Call hFileOpen (gTesttoolpath + "graphics\required\input\effects.odp")
     Sleep (10)
     
-    '/// Start the slideshow. ///'
+    printlog "Start the slideshow."
     CALL hTypeKeys "<F5>"
     Sleep (10)
-    '/// Press "Space" again, to continue with slide two. ///'
+    printlog "Press Space again, to continue with slide two."
     kontext "DocumentPresentation"
      while DocumentPresentation.exists()
         DocumentPresentation.TypeKeys "<SPACE>"
@@ -362,14 +357,15 @@ testcase tiPengineAllShapesAndEffects
         kontext "DocumentImpress"
     end if
 
-'/// Close Application ///'
+printlog "Close Application"
     Call hCloseDocument
     Printlog "Finished Optional-test for Presentation-Engine"
 endcase 'tiPengineAllShapesAndEffects
 
-'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+'-------------------------------------------------------------------------------
 
 testcase tiPengine2ObjectsGetsEffects
+
     dim i as integer
     dim t as integer
     dim q as integer
@@ -385,7 +381,6 @@ testcase tiPengine2ObjectsGetsEffects
 
     kontext "Toolbar"
     sleep (1)
-    printlog "insert a Smiley."
     printlog "From the toolbar: Insert three objects:"
     printlog "insert a Smiley."
     kontext "Toolbar"
@@ -469,9 +464,7 @@ testcase tiPengine2ObjectsGetsEffects
         warnlog "Error when switching Tab"
     end if
     Kontext "Tasks"
-
     printlog "Effect no 3"
-
     printlog "Insert new slide"
     InsertSlide
     Printlog "Inserted new Slide" 
@@ -507,7 +500,6 @@ testcase tiPengine2ObjectsGetsEffects
             Kontext "Tasks"
 
             printlog "Effect no 4"
-
             printlog "Click button 'Add...'"
             EffectAdd.click
             printlog "Dialog 'Custom Animation' comes up"
@@ -570,16 +562,19 @@ testcase tiPengine2ObjectsGetsEffects
     Printlog "Finished Optional-test for Presentation-Engine"
 endcase 'tiPengine2ObjectsGetsEffects
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------
+'-------------------------------------------------------------------------------
 
 Function TestAnimations
-   '/// select in the listbox 'Effects' the second entry///'
+
+   printlog "Function: TestAnimations: select in the listbox 'Effects' the second entry"
+
    Dim i as Integer
    Dim s as Integer
    Dim q as Integer
    Dim e as Integer
    Dim o as Integer
    Dim p as Integer
+
    i = Effects.GetItemCount
    s = Speed.GetItemCount
    AutomaticPreview.Check
@@ -588,7 +583,7 @@ Function TestAnimations
        If e <> p Then
            if AutomaticPreview.isChecked = TRUE then sleep 1
            Printlog "Effect has position Nr: " + Effects.GetSelIndex + ". Name of effect: " + Effects.GetSelText
-           '/// Select the next entry ///'
+           printlog "Select the next entry"
            Effects.TypeKeys "<DOWN>"
            p = Effects.GetSelIndex
        Else
@@ -606,4 +601,4 @@ Function TestAnimations
    sleep 1
    AutomaticPreview.Check
    Kontext
-end Function
+end Function
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
index 441e0a323099..724aaa8b70a4 100644
--- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
@@ -30,75 +30,69 @@
 '* short description :
 '*
 '*********************************************************************
-' #1 tiInsertExpandSlide
-' #1 tiInsertSummarySlide
-' #1 tiFormatSeitenlayout
-' #1 t114174
-' #1 t111862
-'\********************************************************************
 
 '  Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
-'  Inhalt.SetText ConvertPath (gTesttoolPath + "graphics\required\input\leer.sxd")    '/// auto.sdd choosen ///'
+'  Inhalt.SetText ConvertPath (gTesttoolPath + "graphics\required\input\leer.sxd") 
 
 '-------------------------------------------------------------------------------
 testcase tiInsertExpandSlide
-    
-   dim i,x as integer
-   dim sTemp as string
-   dim b116350 as boolean
-
-   '/// open application ///'
-   Call hNewDocument
-   Call sSelectEmptyLayout
-   '/// create presupposition ///
-   '///+ View->Master View->Outline View ///'
-   ViewWorkspaceOutlineView
-      Sleep 1
-      Kontext "DocumentImpressOutlineView"
-      '///+ create a slide with some levels...and some more slides with just one level...  ///'
-      '///+ it should look like this: ///'
-      '///+-------------------------------------------------- ///'
-      '///+ Slide 1///'
-      '///+ - A ///'
-      '///+ - - B///'
-      '///+ - - - C///'
-      '///+ - - - - D///'
-      '///+ - - - - - - F///'
-      '///+ - B///'
-      '///+ - C///'
-      '///+ - D///'
-      '///+ Slide 2 ///'
-      '///+ Slide 3 ///'
-      '///+ Slide 4 ///'
-      '///+ Slide 5 ///'
-      '///+-------------------------------------------------- ///'
-      DocumentImpressOutlineView.TypeKeys "Slide 1"
-      for i = 1 to 6
-         DocumentImpressOutlineView.TypeKeys "<return><tab>"
-         DocumentImpressOutlineView.TypeKeys chr(64+i)
-      next i
-      DocumentImpressOutlineView.TypeKeys "<return>"
-      DocumentImpressOutlineView.TypeKeys ("<shift tab>",5)
-      for i = 1 to 3
-         DocumentImpressOutlineView.TypeKeys chr(65+i)
-         DocumentImpressOutlineView.TypeKeys "<return>"
-      next i
-      DocumentImpressOutlineView.TypeKeys ("<shift tab>")
-      for i = 2 to 5
-         DocumentImpressOutlineView.TypeKeys "Slide " + i
-         DocumentImpressOutlineView.TypeKeys "<return>"
-      next i
-      DocumentImpressOutlineView.TypeKeys "<backspace>"
-   '///+ View->Master View->Drawing View ///'
-   ViewWorkspaceDrawingView
-      Sleep 1
-      '///+ there have to be 5 slides now ///'
-      fGetSlideCount (5)
 
-      '/// goto the first slide ///'
-      hTypeKeys "<home>"
-   '///<b> Insert->Expand Slide </b>///'
-   InsertExpandSlide
+    dim i,x as integer
+    dim sTemp as string
+    dim b116350 as boolean
+
+    printlog "open application "
+    Call hNewDocument
+    Call sSelectEmptyLayout
+    printlog "create presupposition"
+    printlog "View->Master View->Outline View "
+    ViewWorkspaceOutlineView
+    Sleep 1
+    Kontext "DocumentImpressOutlineView"
+    '///+ create a slide with some levels...and some more slides with just one level...  "
+    '///+ it should look like this: "
+    '///+-------------------------------------------------- "
+    '///+ Slide 1"
+    '///+ - A "
+    '///+ - - B"
+    '///+ - - - C"
+    '///+ - - - - D"
+    '///+ - - - - - - F"
+    '///+ - B"
+    '///+ - C"
+    '///+ - D"
+    '///+ Slide 2 "
+    '///+ Slide 3 "
+    '///+ Slide 4 "
+    '///+ Slide 5 "
+    '///+-------------------------------------------------- "
+    DocumentImpressOutlineView.TypeKeys "Slide 1"
+    for i = 1 to 6
+     DocumentImpressOutlineView.TypeKeys "<return><tab>"
+     DocumentImpressOutlineView.TypeKeys chr(64+i)
+    next i
+    DocumentImpressOutlineView.TypeKeys "<return>"
+    DocumentImpressOutlineView.TypeKeys ("<shift tab>",5)
+    for i = 1 to 3
+     DocumentImpressOutlineView.TypeKeys chr(65+i)
+     DocumentImpressOutlineView.TypeKeys "<return>"
+    next i
+    DocumentImpressOutlineView.TypeKeys ("<shift tab>")
+    for i = 2 to 5
+     DocumentImpressOutlineView.TypeKeys "Slide " + i
+     DocumentImpressOutlineView.TypeKeys "<return>"
+    next i
+    DocumentImpressOutlineView.TypeKeys "<backspace>"
+    printlog " View->Master View->Drawing View "
+    ViewWorkspaceDrawingView
+    Sleep 1
+    printlog "there have to be 5 slides now "
+    fGetSlideCount (5)
+
+    printlog "goto the first slide "
+    hTypeKeys "<home>"
+    printlog "Insert->Expand Slide"
+    InsertExpandSlide
       ' usually the content of the new pages is the same as the curren, there is a slide created for every part in the first outline level (gliederungsebene)
       Sleep 1
       if (8 = fGetSlideCount (8)) then
@@ -106,7 +100,7 @@ testcase tiInsertExpandSlide
       else
          warnLog "Bug with Insert Expand Slide"
       endif
-      '///+ check slide content ///'
+      printlog " check slide content "
       hTypeKeys ("<TAB><F2>"
       EditSelectAll
       EditCopy
@@ -142,9 +136,9 @@ testcase tiInsertExpandSlide
       next i
 
       hTypeKeys "<escape><home>"
-   '///<b> Insert->Expand Slide </b>///'
+   printlog "Insert->Expand Slide"
    InsertExpandSlide
-      '/// And since the Second slide now should be named "B", we check that first ///'
+      printlog "And since the Second slide now should be named B, we check that first "
       hTypeKeys ("<TAB><F2>")
       EditSelectAll
       try
@@ -190,7 +184,7 @@ testcase tiInsertExpandSlide
          EditSelectAll
 	 next i
 
-   '/// close application ///'
+   printlog "close application "
    Call  hCloseDocument
 endcase 'tiInsertExpandSlide
 
@@ -285,23 +279,29 @@ testcase tiFormatSeitenlayout
     qaerrorlog "outcommented due to bug"
     goto endsub
     
-        Printlog "Format/Page Layout"
-     Call hNewDocument               '/// new impress document ///'
-    
-     FormatPage                '/// format page ///'
+    Printlog "Format/Page Layout"
+    printlog "new impress document "
+     Call hNewDocument               
+
+     printlog "format page "
+     FormatPage                
      Kontext "Tasks"
      sleep 5
-     SetClipboard LayoutsPreview.GetText       '/// get page name ///'
-     SeitenName.SetText "Test"          '/// change page name ///'
+     printlog "get page name "
+     SetClipboard LayoutsPreview.GetText
+     printlog "change page name "
+     SeitenName.SetText "Test"          
      sleep 1
-     if Hintergrund.IsChecked=False Then         '/// check background ///'
+     printlog "check background "
+     if Hintergrund.IsChecked=False Then         
        Hintergrund.Check
      else
        Hintergrund.UnCheck
             if Hintergrund.IsChecked=False Then PrintLog " Background is deactivated"
      end if
-    
-     if ObjekteAufDemHintergrund.IsChecked = True Then       '/// change status of objects on background ///'
+
+     printlog "change status of objects on background "
+     if ObjekteAufDemHintergrund.IsChecked = True Then       
        PrintLog " Object on background is activated"
        ObjekteAufDemHintergrund.UnCheck
        if ObjekteAufDemHintergrund.IsChecked = False Then PrintLog " Objects on background are deactivated"
@@ -309,9 +309,11 @@ testcase tiFormatSeitenlayout
        ObjekteAufDemHintegrund.Check
        PrintLog " Object on background is activated"
      end if
-     Seitenlayout.OK              '/// close dialog ///'
+     printlog "close dialog "
+     Seitenlayout.OK              
      sleep 1
-     FormatPage                '/// reopen dialog ///'
+     printlog "reopen dialog "
+     FormatPage                
      Kontext "LayoutsPreview"
      sleep 2
      if GetClipboardText <> SeitenName.GetText Then
@@ -320,7 +322,8 @@ testcase tiFormatSeitenlayout
        WarnLog " Page name is not correct"
      end if
      sleep 2
-     LayoutsPreview.TypeKeys "<TAB>"            '/// assign different page layout ///'
+     printlog "assign different page layout "
+     LayoutsPreview.TypeKeys "<TAB>"            
      LayoutsPreview.TypeKeys "<DOWN>" ,2
      LayoutsPreview.TypeKeys "<Return>"
      sleep 2
@@ -338,7 +341,8 @@ testcase tiFormatSeitenlayout
      sleep 3
      DocumentImpress.MouseDoubleClick 25,60
      sleep 3
-     Kontext "GrafikEinfuegenDlg"          '/// check in document if layout has changed ///'
+     printlog "check in document if layout has changed "
+     Kontext "GrafikEinfuegenDlg"          
      sleep 2
      if GrafikEinfuegenDlg.exists (5) then
         try
@@ -361,13 +365,14 @@ testcase tiFormatSeitenlayout
      endif
       sleep 3
      Kontext "DocumentImpress"
-     Call hCloseDocument             '/// close document ///'
+     printlog "close document "
+     Call hCloseDocument             
     endcase 'tiFormatSeitenlayout
     
 '------------------------------------------------------------------------------
 testcase t114174
 
-    '/// resulting from regression in #111862#  ///'
+    printlog "resulting from regression in #111862#  "
     dim sReference(2) as string
     dim sText(2) as string
     dim i as integer
@@ -385,10 +390,10 @@ testcase t114174
 
     sReference(1) = "Koelle"
     sReference(2) = "Alaaf!"
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
 
-    '/// Format->Modify Layout ///'
+    printlog "Format->Modify Layout "
     FormatPage
     Kontext "Tasks"
         LayoutsPreview.TypeKeys "<TAB>"
@@ -414,7 +419,7 @@ testcase t114174
         endif
     next i
 
-    '/// deselect all by typing key 'ESCAPE' again ///'
+    printlog "deselect all by typing key 'ESCAPE' again "
     hTypeKeys("<Escape>")
 
     hFileSaveAsKill(sFile)
@@ -477,10 +482,10 @@ testcase t111862
 
     sReference(1) = "Koelle"
     sReference(2) = "Alaaf!"
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
 
-    '/// Format->Modify Layout ///'
+    printlog "Format->Modify Layout "
     Formatpage
     Kontext "Tasks"
         LayoutsPreview.TypeKeys "<TAB>"
@@ -519,4 +524,4 @@ testcase t111862
     hCloseDocument()
     
 endcase 't111862
-'------------------------------------------------------------------------------
+'------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
index cfcc0fbd2e2f..2c51a83a509a 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
@@ -38,7 +38,7 @@ testcase tSlideShowSlideShow
     dim testfile as string
     dim localtestfile as string
 
-    '/// open file 'graphics\\input\\diashow.odp' ///'
+    printlog "open file 'graphics\input\diashow.odp' "
     testfile = ( gTesttoolPath + "graphics\required\input\diashow.odp" )
     hFileOpenLocally( testfile )
     sleep 30
@@ -48,11 +48,11 @@ testcase tSlideShowSlideShow
    Kontext "Navigator"
    if Navigator.Exists then Navigator.Close
 
-   '/// Deactivate "Start with current page" in ToolsOptions ///'
+   printlog "Deactivate Start with current page in ToolsOptions "
    setStartCurrentPage(FALSE)
 
    try
-   '/// SlideShow->Slide Show Settings... ///'
+   printlog "SlideShow->Slide Show Settings... "
       SlideShowPresentationSettings
       bLoaded = true
    catch
@@ -61,17 +61,17 @@ testcase tSlideShowSlideShow
    if bLoaded then
       Kontext "Bildschirmpraesentation"
 
-      '/// check Radio button 'Type': 'Window' ///'
+      printlog "check Radio button 'Type': 'Window' "
       Fenster.Check
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "close dialog 'Slide Show' with OK "
       Bildschirmpraesentation.OK
       sleep 3
-      '/// start the slideshow with 'Slide Show->Slide Show' ///'
+      printlog "start the slideshow with 'Slide Show->Slide Show' "
       SlideShowSlideshow
          sleep 3
          Kontext "DocumentPresentation"
          sleep 5
-      '/// end the presentation by typing [ESCAPE] ///'
+      printlog "end the presentation by typing [ESCAPE] "
     DocumentPresentation.TypeKeys "<ESCAPE>"
       sleep 3
         try
@@ -83,7 +83,7 @@ testcase tSlideShowSlideShow
           sleep 3
         endcatch
 
-      '/// start the slideshow with 'Slide Show->Slide Show' ///'
+      printlog "start the slideshow with 'Slide Show->Slide Show' "
       SlideShowSlideshow
       Kontext "DocumentPresentation"
       Printlog "- Check if slideshow runs"
@@ -94,14 +94,14 @@ testcase tSlideShowSlideShow
          Warnlog "Presentation is not running !"
       endcatch
       sleep 5
-      '/// type the key [SHIFT + F5] to open the navigator ///'
+      printlog "type the key [SHIFT + F5] to open the navigator "
       DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
       Kontext "NavigatorDraw"
          sleep 1
-         '/// check in list, if the page changed ///'
+         printlog "check in list, if the page changed "
          if Liste.GetSelIndex <> 2 Then Warnlog "- pagedown not working: '" + Liste.GetSelText+"'"
          Kontext "DocumentPresentation"
-         '/// press key [cursor right] 3 times ///'
+         printlog "press key [cursor right] 3 times "
          for i = 1 to 3
             sleep 3
             DocumentPresentation.TypeKeys "<right>"
@@ -124,11 +124,11 @@ testcase tSlideShowSlideShow
       warnlog "Document didn't get loaded"
    endif
    Kontext "DocumentImpress"
-   '///  Close the Navigator ///'
+   printlog " Close the Navigator "
    DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"
-   '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
+   printlog "Set Start with current page back to default = on, in ToolsOptions "
    setStartCurrentPage(TRUE)
-   '/// close the application ///'
+   printlog "close the application "
     Call hCloseDocument
     localtestfile = hFileGetLocalPath( gTesttoolPath + "diashow.odp" )
     printlog localtestfile
@@ -143,17 +143,19 @@ endcase 'tSlideShowSlideShow
 '-------------------------------------------------------------------------------
 
 testcase tSlideShowRehearseTimings
+
     qaerrorlog "#i64783# - tSlideShowRehearseTimings outcommented due to bug"
     goto endsub
+
     dim bLoaded as boolean
     dim i as integer
 
-   '/// open file 'graphics\\input\\diashow.odp' ///'
+   printlog "open file 'graphics\input\diashow.odp' "
    hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
    sleep 10
-   ' 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
+      printlog "make the document writable and check if it's succesfull"
       if fMakeDocumentWritable = false then
          warnlog "The document can't be make writeable. Test stopped."
          goto endsub
@@ -163,7 +165,7 @@ testcase tSlideShowRehearseTimings
    if Navigator.Exists then Navigator.Close
    bLoaded = false
    try
-      '/// SlideShow->Slide Show Settings... ///'
+      printlog "SlideShow->Slide Show Settings... "
         SlideShowPresentationSettings
       bLoaded = true
     catch
@@ -171,12 +173,12 @@ testcase tSlideShowRehearseTimings
    endcatch
    if bLoaded then
        Kontext "Bildschirmpraesentation"
-      '/// check Radio button 'Type': 'Window' ///'
+      printlog "check Radio button 'Type': 'Window' "
        Fenster.Check
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "close dialog 'Slide Show' with OK "
        Bildschirmpraesentation.OK
        sleep 3
-      '/// start the slideshow with 'Slide Show->Rehearse Timings' ///'
+      printlog "start the slideshow with 'Slide Show->Rehearse Timings' "
       SlideShowRehearseTimings
       Kontext "DocumentPresentation"
       if DocumentPresentation.Exists then
@@ -184,7 +186,7 @@ testcase tSlideShowRehearseTimings
       else
         warnlog "bah"
       endif
-     '/// press key [return] 5 times ///'
+     printlog "press key [return] 5 times "
       for i = 1 to 5
          sleep 5
          DocumentPresentation.TypeKeys "<return>"
@@ -204,15 +206,15 @@ testcase tSlideShowRehearseTimings
       warnlog "Documnet didn't get loaded"
    endif
 
-   '///  check state of navigator ! expected: closed ///'
+   printlog " check state of navigator ! expected: closed "
    Kontext "Navigator"
    if Navigator.exists then
-      '///+ close navigator ! ///'
+      printlog " close navigator ! "
       Navigator.Close
    else
       printlog "Navigator: NOT available"
    endif
-   '/// close the application ///'
+   printlog "close the application "
    Call hCloseDocument
    
 endcase 'tSlideShowRehearseTimings
@@ -242,64 +244,64 @@ testcase tSlideShowSlideShowSettings
    ' the state of the navigator in the normal view is not affected
    ' the navigator that is open in normal view, is not visible in windows presenattions
 
-   '/// open application ///'
+   printlog "open application "
    Call hNewDocument
 
-'///  check state of navigator ! expected: closed ///'
+    printlog " check state of navigator ! expected: closed "
    Kontext "Navigator"
    if Navigator.exists then
-      '///+ close navigator ! ///'
+      printlog "close navigator ! "
       Navigator.Close
       QaErrorLog "Navigator was open. Check earlier tests. Now closed."
    else
       printlog "Navigator: NOT available. Good."
    endif
 
-   '/// Slide Show -> Slide Show Settings ///'
+   printlog "Slide Show -> Slide Show Settings "
     SlideShowPresentationSettings
       Kontext "Bildschirmpraesentation"
-       '/// check checkbox in section 'Range' - 'From: ///'
+       printlog "check checkbox in section 'Range' - 'From: "
        AbDia.Check
-      '/// get count of slides from listbox 'From:' ///'
+      printlog "get count of slides from listbox 'From:' "
       x = AbDiaName.GetItemCount
-      '/// check if count in listbox 'from' is '0' ///'
+      printlog "check if count in listbox 'from' is '0' "
       if (x = 1) Then
          Printlog "  - Slide count in the list: '" + x + "'"
       else
           Warnlog "  - unexpected slide count; should be '1'; is '" + x + "'"
        end if
-   '/// close dialog 'Slide Show' with OK ///'
+   printlog "close dialog 'Slide Show' with OK "
    Bildschirmpraesentation.OK
-   '/// Insert->Slide... ///'
+   printlog "Insert->Slide... "
    InsertSlide
    sleep 2
    hTypekeys "<Pagedown>"
    sleep 2
-   '/// Slide Show -> Slide Show Settings ///'
+   printlog "Slide Show -> Slide Show Settings "
    SlideShowPresentationSettings
       Kontext "Bildschirmpraesentation"
-      Printlog "'///<b> check if count in listbox 'from' increased </b>///'"
+      Printlog "check if count in listbox 'from' increased"
       i = AbDiaName.GetItemCount
       if ((i -1) = x) Then
          Printlog "  - Slide appears in the list; count : '" + i + "'"
       else
           Warnlog "  - Slide not added; is '" + i + "' should: '" + x + "'"
        end if
-   '/// close dialog 'Slide Show' with CANCEL ///'
+   printlog "close dialog 'Slide Show' with CANCEL "
    Bildschirmpraesentation.Cancel
-   '/// close application ///'
+   printlog "close application "
    Call hCloseDocument
    sleep 5
 
     bLoaded = false
-    '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///'
+    printlog "open file 'graphics\input\diashow.odp' (Slide Show with 4 Slides) "
     sTestfile = ( gTesttoolPath + "graphics\required\input\diashow.odp" )
     hFileOpenLocally( sTestfile )
    sleep 10
 
    try
       Kontext "DocumentImpress"
-      '/// Slide Show -> Slide Show Settings ///'
+      printlog "Slide Show -> Slide Show Settings "
       Printlog "'--------------------------------------------------------------------------"
       SlideShowPresentationSettings
       bLoaded = true
@@ -317,19 +319,19 @@ testcase tSlideShowSlideShowSettings
       if (NavigatorSichtbar.IsChecked) then
          Warnlog "'Navigator visible' is checked :-("
       endif
-      '///<b> check checkbox 'All Slides' </b>///'
+      printlog "check checkbox 'All Slides'"
       AlleDias.Check
-      '///<b> check checkbox 'Window' </b>///'
+      printlog "check checkbox 'Window"
       Fenster.Check
-      '///<b> check checkbox 'Navigator visible' </b>///'
-      NavigatorSichtbar.Check                 '--------------------------------------------------------------------------
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "check checkbox 'Navigator visible"
+      NavigatorSichtbar.Check                 
+      printlog "close dialog 'Slide Show' with OK "
       Bildschirmpraesentation.OK
-      '/// start the slideshow with 'Slide Show->Slide Show' ///'
+      printlog "start the slideshow with 'Slide Show->Slide Show' "
       SlideShowSlideshow
       Printlog "'---------------------------- START P -- All -- Window -- Navigator -------------------------"
      sleep 5
-      '///  check state of navigator ! expected: open ///'
+      printlog " check state of navigator ! expected: open "
       Kontext "Navigator"
       if Navigator.exists then
          Printlog "Navigator: open :-)"
@@ -341,7 +343,7 @@ testcase tSlideShowSlideShowSettings
       sleep 1
       Kontext "DocumentPresentation"
       try
-         '/// press pagedown ///'
+         printlog "press pagedown "
          DocumentPresentation.TypeKeys "<pagedown>"
       catch
          Warnlog "presentation is not running !"
@@ -351,8 +353,8 @@ testcase tSlideShowSlideShowSettings
       if Liste.GetSelIndex <> 2 Then
          warnlog "Wrong slide."
       endif
-      '/// press the key [Page Down] 3 times ///'
-      '///+ check in Navigator list, if the slide is number: (times key pressed) ///'
+      printlog "press the key [Page Down] 3 times "
+      printlog "check in Navigator list, if the slide is number: (times key pressed) "
       for i = 2 to 4
          Kontext "Navigator"
          if Navigator.exists then
@@ -367,7 +369,7 @@ testcase tSlideShowSlideShowSettings
          DocumentPresentation.TypeKeys "<pagedown>"
       next i
       sleep (2)
-      '/// press the key [Page Down] to exit presentation ///'
+      printlog "press the key [Page Down] to exit presentation "
       DocumentPresentation.TypeKeys "<pagedown>"
       sleep (5)      
       try
@@ -378,20 +380,20 @@ testcase tSlideShowSlideShowSettings
          DocumentPresentation.TypeKeys "<ESCAPE>"
       endcatch
       sleep 2
-      '///  check state of navigator ! expected: open ///'
+      printlog " check state of navigator ! expected: open "
       Kontext "Navigator"
       if Navigator.exists then
-         '///+ close navigator ! ///'
+         printlog "close navigator ! "
          Navigator.Close
       else
          printlog "Navigator: NOT available"
       endif
-      Printlog "'--------------------------------------------------------------------------"
+      Printlog "'---------------------------------------------------------------"
 
        Kontext "DocumentPresentation"
-      '/// type the key [MOD1 SHIFT F5] to open the navigator ///' '--------------------------------------------------------------------------
+      printlog "type the key [MOD1 SHIFT F5] to open the navigator "
       hTypeKeys "<MOD1 SHIFT F5>"
-      '/// Slide Show -> Slide Show Settings ///'
+      printlog "Slide Show -> Slide Show Settings "
       SlideShowPresentationSettings
          Kontext "Bildschirmpraesentation"
          if (AlleDias.IsChecked = FALSE) then
@@ -406,59 +408,59 @@ testcase tSlideShowSlideShowSettings
          if (DiawechselAufHintergrund.IsChecked = FALSE) then
             Warnlog "'Change slides by clicking on background' is not checked :-("
          endif
-           '///<b> check checkbox in section 'Range' - 'From: </b>///'
+         printlog "check checkbox in section 'Range' - 'From:"
          AbDia.Check
-         '/// select the 3rd item from the top from listbox 'From:' -> 2 slides to go ///'
+         printlog "select the 3rd item from the top from listbox 'From:' -> 2 slides to go "
          AbDiaName.Select 3
          sTemp = AbDiaName.GetSelText
          Printlog "  -  From '" + sTemp + "' will be shown"
-           '///<b> check checkbox 'Default' </b>///'
+         printlog "check checkbox 'Default'"
          Standard.Check
-         '/// UNcheck checkbox 'Navigator visible'///'
+         printlog "UNcheck checkbox 'Navigator visible'"
          NavigatorSichtbar.UnCheck
-         '/// UNcheck checkbox 'Change slides by clicking on background'///'
+         printlog "UNcheck checkbox 'Change slides by clicking on background'"
          DiawechselAufHintergrund.UnCheck
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "close dialog 'Slide Show' with OK "
       Bildschirmpraesentation.OK
        sleep 3
        Kontext "DocumentPresentation"
-      '/// start the slideshow with 'Slide Show->Slide Show' ///'
+      printlog "start the slideshow with 'Slide Show->Slide Show' "
       SlideShowSlideshow
          Printlog "'---------------------------- START P -- From -- Default -- Click on Bg -----------------------"
          sleep 5
-         '///  check state of navigator ! expected: closed ///'
+         printlog " check state of navigator ! expected: closed "
          Kontext "Navigator"
          if Navigator.exists then
-            '///+ close navigator ! ///'
+            printlog "close navigator ! "
             Navigator.Close
             Warnlog "Navigator: closed"
          else
             Printlog "Navigator: NOT available. Good."
          endif
          sleep 1
-         '/// type the key [MOD1 SHIFT F5] to open the navigator ///' '--------------------------------------------------------------------------
+         printlog "type the key [MOD1 SHIFT F5] to open the navigator "
          Kontext "DocumentPresentation"
          DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
           sleep 3
-          '/// check in Navigator list, if the page is THREE! ///'
+          printlog "check in Navigator list, if the page is THREE! "
           fGetSlideName(S3)
-          '/// click right mouse button ///'
+          printlog "click right mouse button "
           sleep 5
           DocumentPresentation.MouseDown 50,50
           DocumentPresentation.MouseUp 50,50
-          '/// check in Navigator list, if the page is still THREE. If so, change slide with PageDown ///'
+          printlog "check in Navigator list, if the page is still THREE. If so, change slide with PageDown "
           if (fGetSlideName(S3) <> S3) then
              Warnlog "'Change slides by clicking on background' disable did not work :-("
           else
              DocumentPresentation.TypeKeys "<PAGEDOWN>"
           endif
-          '/// check in Navigator list, if the page is FOUR ///'
+          printlog "check in Navigator list, if the page is FOUR "
           fGetSlideName(S4)
           sleep 5
-          '/// press the key [Page Down] ///'
+          printlog "press the key [Page Down] "
           DocumentPresentation.TypeKeys "<pagedown>"
           sleep 5
-          '/// press the key [Space] to exit presentation ///'
+          printlog "press the key [Space] to exit presentation "
           DocumentPresentation.TypeKeys "<Space>"
          sleep 10
       try
@@ -470,10 +472,10 @@ testcase tSlideShowSlideShowSettings
          DocumentPresentation.TypeKeys "<ESCAPE>"
          Warnlog "  - Program was still in slideshow mode - ended now ?"
       endcatch
-      '///  check state of navigator ! expected: open ///'
+      printlog " check state of navigator ! expected: open "
       Kontext "Navigator"
       if Navigator.exists then
-         '///+ close navigator ! ///'
+         printlog "close navigator ! "
          Navigator.Close
          printlog "Navigator: closed"
       else
@@ -481,7 +483,7 @@ testcase tSlideShowSlideShowSettings
       endif
       Printlog "'--------------------------------------------------------------------------"
 
-      '/// Slide Show -> Slide Show Settings ///'
+      printlog "Slide Show -> Slide Show Settings "
       SlideShowPresentationSettings
          Kontext "Bildschirmpraesentation"
          if (AbDia.IsChecked = FALSE) then
@@ -496,33 +498,33 @@ testcase tSlideShowSlideShowSettings
          if (DiawechselAufHintergrund.IsChecked) then
             Warnlog "'Change slides by clicking in background' is checked :-("
          endif
-         '/// check checkbox 'All Slides' ///'
+         printlog "check checkbox 'All Slides' "
          AlleDias.Check
-         '///<b> check check box 'Auto' -> implies looping of slideshow in fullscreen mode </b>///'
+         printlog "check check box 'Auto' -> implies looping of slideshow in fullscreen mode"
          Auto.Check
-         '/// set duration of pause to '00:00:05' ///'
+         printlog "set duration of pause to '00:00:05' "
          Zeit.SetText "00:00:05"
-         '/// check check box 'Show logo' ///'
+         printlog "check check box 'Show logo' "
          LogoAnzeigen.Check
-         '/// check checkbox 'Change slides by clicking on background'///'
+         printlog "check checkbox 'Change slides by clicking on background'"
          DiawechselAufHintergrund.Check
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "close dialog 'Slide Show' with OK "
       Bildschirmpraesentation.OK
-      '/// start the slideshow with 'Slide Show->Slide Show' ///'
+      printlog "start the slideshow with 'Slide Show->Slide Show' "
       SlideShowSlideshow
       Printlog "'---------------------------- START P -- All -- Auto -- :05 -- Logo -----------------------------"
       sleep 3
       Kontext "DocumentPresentation"
-      '/// type the key [MOD1 SHIFT F5] to open the navigator ///' '--------------------------------------------------------------------------
+      printlog "type the key [MOD1 SHIFT F5] to open the navigator "
       DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
-      '/// press the key [Space] 4 times ///'
-      '///+ check in Navigator list, if the slide is number: [(times key pressed) -1 ] ///'
+      printlog "press the key [Space] 4 times "
+      printlog "check in Navigator list, if the slide is number: [(times key pressed) -1 ] "
       for i = 1 to 4
          fGetSlideName(saSlideNames(i))
          DocumentPresentation.TypeKeys "<Space>"
          sleep 5
       next i
-        '/// wait until autopause ended (5 secs) ///'
+        printlog "wait until autopause ended (5 secs) "
         sleep 10
       if (fGetSlideName(saSlideNames(1)) = saSlideNames(1)) then
          Printlog "  - Enless loop works"
@@ -530,7 +532,7 @@ testcase tSlideShowSlideShowSettings
          Warnlog " Enless loop does NOT work"
       end if
       sleep 2
-      '/// type key [excape] to exit presentation ///'
+      printlog "type key [excape] to exit presentation "
       Kontext "DocumentPresentation"
       DocumentPresentation.TypeKeys "<ESCAPE>"
       sleep 5
@@ -544,7 +546,7 @@ testcase tSlideShowSlideShowSettings
          DocumentImpress.TypeKeys "<ESCAPE>"
          sleep 5
       endcatch
-      '///  check state of navigator ! expected: closed ///'
+      printlog " check state of navigator ! expected: closed "
       Kontext "Navigator"
       if Navigator.exists then
          Navigator.Close
@@ -555,56 +557,56 @@ testcase tSlideShowSlideShowSettings
       Printlog "'--------------------------------------------------------------------------"
 
       Kontext "DocumentImpress"
-      '/// Slide Show -> Slide Show Settings ///'
+      printlog "Slide Show -> Slide Show Settings "
       SlideShowPresentationSettings
          Kontext "BildschirmPraesentation"
-         '/// check checkbox 'default' ///'
+         printlog "check checkbox 'default' "
          Standard.Check
-         '///<b> check checkbox 'Change slides maually' </b>///'
-         ' to check this i need an automatic transition somewhere in the presentation !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+         printlog "check checkbox 'Change slides maually'"
+         ' to check this i need an automatic transition somewhere in the presentation !
          DiawechselManuel.Check
-         '///<b> check checkbox 'Mouse pointer as pen' </b>///'
+         printlog "check checkbox 'Mouse pointer as pen'"
          MauszeigerAlsStift.Check
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "close dialog 'Slide Show' with OK "
       BildschirmPraesentation.Ok
       sleep 1
 
-      '/// goto the first slide by typing [strg home] ///'
+      printlog "goto the first slide by typing [strg home] "
       hTypeKeys "<mod1 home>"
-      '///+ -  SlideShow->SlideTransition ///'
+      printlog "SlideShow->SlideTransition "
       SlideShowSlideTransition
          Kontext "Tasks"
-         '///+ -  click button 'Extras' ///'
+         printlog "click button 'Extras' "
          sleep 1
-         '///+ - + click button 'Automatic Transition' ///'
+          printlog "click button 'Automatic Transition' "
          TransitionAutomaticallyAfter.Check 'click
-         '///+ -  + +  Set Time to '00:00:01' ///'
+         printlog " Set Time to '00:00:01' "
          TransitionAutomaticallyAfterTime.SetText "2"
-         '///+ -  click button 'Assign' ///'
+         printlog " click button 'Assign' "
          TransitionApplyToAllSlides.Click
-         '///+ - close dialog 'Slide Transition' ///'
+         printlog "close dialog 'Slide Transition' "
       sleep 3
 
-      '/// start the slideshow with keys [STRG F2] ///'
+      printlog "start the slideshow with keys [STRG F2] "
        Kontext "DocumentImpress"
       DocumentImpress.TypeKeys "<MOD1 F2>"
       Printlog "'---------------------------- START P -- Default -- Manuel ------------------------------"
-      '/// wait 10 seconds (to get the dia changed automatical has not to happen !) ///'
+      printlog "wait 10 seconds (to get the dia changed automatical has not to happen !) "
       sleep 10
       Kontext "DocumentPresentation"
-         '/// type the key [MOD1 SHIFT F5] to open the navigator ///' '--------------------------------------------------------------------------
+         printlog "type the key [MOD1 SHIFT F5] to open the navigator "
          DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
-         '/// press key [cursor right] 3 times ///'
+         printlog "press key [cursor right] 3 times "
          for i = 1 to 4
             sleep 5
             fGetSlideName(saSlideNames(i))
-            '///+ use the left mouse button, to use the pen drawing function ///'
+            printlog "use the left mouse button, to use the pen drawing function "
             DocumentPresentation.MouseDown (10, 10)
             DocumentPresentation.MouseMove (10, 90)
             DocumentPresentation.MouseUp (10, 90)
             DocumentPresentation.TypeKeys "<right>"
          next i
-      '/// press the key [Page Down] to exit presentation ///'
+      printlog "press the key [Page Down] to exit presentation "
       sleep (2)
       DocumentPresentation.TypeKeys "<pagedown>"
       sleep (2)
@@ -615,10 +617,10 @@ testcase tSlideShowSlideShowSettings
          Printlog "- Slideshow ended at the right time"
       endif
       sleep 2
-      '///  check state of navigator ! expected: closed ///'
+      printlog " check state of navigator ! expected: closed "
       Kontext "Navigator"
       if Navigator.exists then
-         '///+ close navigator ! ///'
+        printlog "close navigator ! "
          Navigator.Close
          warnlog "Navigator: closed"
       else
@@ -627,50 +629,50 @@ testcase tSlideShowSlideShowSettings
       Printlog "'--------------------------------------------------------------------------"
 
       Kontext "DocumentImpress"
-      '/// Slide Show -> Slide Show Settings ///'
+      printlog "Slide Show -> Slide Show Settings "
       SlideShowPresentationSettings
          Kontext "BildschirmPraesentation"
-         '/// check checkbox 'default' ///'
+         printlog "check checkbox 'default' "
          Standard.Check
-         '///<b> UNcheck checkbox 'Change slides manually' </b>///'
+         printlog "UNcheck checkbox 'Change slides manually'"
          DiawechselManuel.UNCheck
-         '/// UNcheck checkbox 'Mouse pointer as pen' ///'
+         printlog "UNcheck checkbox 'Mouse pointer as pen' "
          MauszeigerAlsStift.UNCheck
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "close dialog 'Slide Show' with OK "
       BildschirmPraesentation.Ok
       sleep 1
-      '/// goto the first slide by typing [strg home] ///'
+      printlog "goto the first slide by typing [strg home] "
       hTypeKeys "<MOD1 HOME>"
-      '/// Set all slides to 'wait 10 seconds' to get the slide changed automatically ///'
-      '///+ -  SlideShow->SlideTransition ///'
+      printlog "Set all slides to 'wait 10 seconds' to get the slide changed automatically "
+      printlog "SlideShow->SlideTransition "
       SlideShowSlideTransition
          Kontext "Tasks"
-         '///+ -  click button 'Extras' ///'
+         printlog "click button 'Extras' "
          sleep 1
-         '///+ - + click button 'Automatic Transition' ///'
+         printlog "click button 'Automatic Transition' "
          TransitionAutomaticallyAfter.Check 'click
-         '///+ -  + +  Set Time to '10sec' ///'
+         printlog "Set Time to '10sec' "
          TransitionAutomaticallyAfterTime.SetText "10"
-         '///+ -  click button 'Apply to all Slides' ///'
+         printlog "click button 'Apply to all Slides' "
          TransitionApplyToAllSlides.Click
-         '///+ - close dialog 'Slide Transition' ///'
+         printlog "close dialog 'Slide Transition' "
          sleep (1)
-      '/// start the slideshow with keys [STRG F2] ///'
+      printlog "start the slideshow with keys [STRG F2] "
       Kontext "DocumentImpress"
       DocumentImpress.TypeKeys "<MOD1 F2>"
       Printlog "'---------------------------- START P -- Default -- Automatic -----------------------------"
-      '/// Wait 6 seconds to see if the Automatic Transition changes the slide. ///'
+      printlog "Wait 6 seconds to see if the Automatic Transition changes the slide. "
       sleep 6
       Kontext "DocumentPresentation"
-         '/// type the key [MOD1 SHIFT F5] to open the navigator ///' '--------------------------------------------------------------------------
+         printlog "type the key [MOD1 SHIFT F5] to open the navigator "
          DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
-         '/// press key [cursor right] 3 times ///'
+         printlog "press key [cursor right] 3 times "
          for i = 2 to 4
             sleep (5)
             fGetSlideName(saSlideNames(i))
             DocumentPresentation.TypeKeys "<right>"
          next i
-      '/// press the key [Page Down] to exit presentation ///'
+      printlog "press the key [Page Down] to exit presentation "
       sleep (2)
       DocumentPresentation.TypeKeys "<PAGEDOWN>"
       sleep (2)
@@ -681,18 +683,18 @@ testcase tSlideShowSlideShowSettings
          Printlog "- Slideshow ended at the right time"
       endif
       sleep 2
-      '///  check state of navigator ! expected: closed ///'
+      printlog " check state of navigator ! expected: closed "
       Kontext "Navigator"
       if Navigator.exists then
-         '///+ close navigator ! ///'
+         printlog "close navigator ! "
          Navigator.Close
       endif
    else
       warnlog "document didn't get loaded"
    endif
-   '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
+   printlog "Set Start with current page back to default = on, in ToolsOptions "
    setStartCurrentPage(TRUE)
-   '/// Close the document ///'
+   printlog "Close the document "
    call hCloseDocument
     sLocaltestfile = hFileGetLocalPath(  gTesttoolPath + "diashow.odp" )
     printlog sLocaltestfile
@@ -714,110 +716,110 @@ testcase tSlideShowCustomSlideShow
    dim sTemp as string
 
    Seite = s1
-   '/// open application ///'
+   printlog "open application "
    Call hNewDocument
 
    Kontext "Navigator"
    if Navigator.Exists then Navigator.Close
-   '/// Deactivate "Start with current page" in ToolsOptions ///'
+   printlog "Deactivate Start with current page in ToolsOptions "
    setStartCurrentPage(FALSE)
 
-   '/// create a rectangle ///'
+   printlog "create a rectangle "
    hRechteckErstellen 30,30,60,60
-   '/// do 2 times : ///'
+   printlog "do 2 times : "
    for i = 1 to 2
-      '///+ Insert->Slide... ///'
+      printlog "Insert->Slide... "
       InsertSlide
       sleep 2
       hTypekeys "<Pagedown>"
       sleep 2
-      '///+ create a rectangle ///'
+      printlog "create a rectangle "
       hRechteckErstellen 30,30,70,70
    next i
 
-   '/// Slide Show -> Slide Show Settings ///'
+   printlog "Slide Show -> Slide Show Settings "
    SlideShowPresentationSettings
       Kontext "Bildschirmpraesentation"
       if (Fenster.IsChecked = False) Then Fenster.Check
-      '/// close dialog 'Slide Show' with OK ///'
+      printlog "close dialog 'Slide Show' with OK "
       Bildschirmpraesentation.OK
 
-   '/// Slide Show -> Custom Slide Show... ///'
+   printlog "Slide Show -> Custom Slide Show... "
    SlideShowCustomSlideshow
       Kontext "IndividuellePraesentation"
-      '///<b> click button 'New...' </b>///'
+      printlog "click button 'New...' "
       Neu.Click
 
          Kontext "IndividuellePraesentationDefinieren"
-         '/// type something in 'Name' ///'
+         printlog "type something in 'Name' "
          PraesentationName.SetText "Individually 1"
-         '/// select the first entry in the list 'Existing Slides' ///'
+         printlog "select the first entry in the list 'Existing Slides' "
          SeitenPraesentation.Select 1
-         '/// click button '>>' ///'
+         printlog "click button '>>' "
          Hinzufuegen.Click
          i = SelectedSlides.GetItemCount
          if (i <> 1) Then
             Warnlog "-  Number of slides 'Selected Slides' is not correct. It should be = '1', but it is = '" + i + "'"
          endif
-         '/// close dialog 'Define Custom Slide Show' with OK ///'
+         printlog "close dialog 'Define Custom Slide Show' with OK "
          IndividuellePraesentationDefinieren.OK
       Kontext "IndividuellePraesentation"
-      '///<b> click button 'Edit...' </b>///'
+      printlog "click button 'Edit...'"
       Bearbeiten.Click
          Kontext "IndividuellePraesentationDefinieren"
-         '/// select an entry in the list 'Selected Slides' ///'
+         printlog "select an entry in the list 'Selected Slides' "
          SelectedSlides.TypeKeys "<pagedown>"
-         '/// click button '<<' ///'
+         printlog "click button '<<' "
          Entfernen.Click
          i = SelectedSlides.GetItemCount
          if (i <> 0) Then
             Warnlog "  Removing slides from list 'Selected Slides' does not work It should be = '1', but it is = '" + i + "'"
          endif
-         '/// select the first entry in the list 'Existing Slides' ///'
+         printlog "select the first entry in the list 'Existing Slides' "
          SeitenPraesentation.Select 1
-         '/// click button '>>' ///'
+         printlog "click button '>>' "
          Hinzufuegen.Click
-         '/// close dialog 'Define Custom Slide Show' with OK ///'
+         printlog "close dialog 'Define Custom Slide Show' with OK "
          IndividuellePraesentationDefinieren.OK
       Kontext "IndividuellePraesentation"
 
-      '///<b> check checkbox 'Use Custom Slide Show' </b>///' '-------------------------------------------------------
+      printlog "check checkbox 'Use Custom Slide Show'"
       IndividuellePraesentationBenutzen.Check
-   '///<b> click button 'Start...' </b>///'
+   printlog "click button 'Start..."
    Starten.Click
       sleep 2
       Kontext "DocumentPresentation"
-     '/// press key [space] 2 times ///'
+     printlog "press key [space] 2 times "
       DocumentPresentation.TypeKeys "<space>"
       sleep 2
       DocumentPresentation.TypeKeys "<space>"
       sleep 5
       try
          Kontext "IndividuellePraesentation"
-         '/// close dialog 'Custom Slide Shows' with button 'Close' ///'
+         printlog "close dialog 'Custom Slide Shows' with button 'Close' "
          IndividuellePraesentation.Close
       catch
          Warnlog "- Slideshow did not end after slide 1"
          DocumentPresentation.TypeKeys "<space>"
          sleep 2
       endcatch
-   '/// Slide Show -> Custom Slide Show... ///'
+   printlog "Slide Show -> Custom Slide Show... "
    SlideShowCustomSlideshow
       Kontext "IndividuellePraesentation"
-      '/// click button 'Edit...' ///'
+      printlog "click button 'Edit...' "
       Bearbeiten.Click
          Kontext "IndividuellePraesentationDefinieren"
-         '/// select 1st entry in the list 'Selected Slides' ///'
+         printlog "select 1st entry in the list 'Selected Slides' "
          SelectedSlides.Select 1
-         '/// click button '<<' ///'
+         printlog "click button '<<' "
          Entfernen.Click
          i = SelectedSlides.GetItemCount
          if (i <> 0) Then
             Warnlog "-  Add and remove slides does not work properly. It should be '0', but it is = '"+i+"'"
          endif
-         '/// select the first entry in the list 'Existing Slides' ///'
+         printlog "select the first entry in the list 'Existing Slides' "
          SeitenPraesentation.Select 1
-         '/// click button '>>'  4 times ///'
+         printlog "click button '>>'  4 times "
          for i =1 to 4
             Hinzufuegen.Click
          next i
@@ -828,16 +830,16 @@ testcase tSlideShowCustomSlideShow
                Warnlog "-  Wrong slide added to individual slideshow. Instead of '" + Seite + "', '" + sTemp + "' was added"
             endif
          next i
-         '/// close dialog 'Define Custom Slide Show' with OK ///'
+         printlog "close dialog 'Define Custom Slide Show' with OK "
          IndividuellePraesentationDefinieren.OK
       sleep 1
       Kontext "IndividuellePraesentation"
 
-      '///<b> UNcheck checkbox 'Use Custom Slide Show' </b>///'
+      printlog "UNcheck checkbox 'Use Custom Slide Show'"
       IndividuellePraesentationBenutzen.UnCheck
-      '/// click button 'Start...' ///'
-      Starten.Click               '---------------------------- START P ----------------------------------------------
-        '/// press key [space] 4 times ///'
+      printlog "click button 'Start...' "
+      Starten.Click               
+        printlog "press key [space] 4 times "
          kontext "DocumentPresentation"
          for i = 1 to 4
             sleep 3
@@ -845,19 +847,19 @@ testcase tSlideShowCustomSlideShow
          next i
          sleep 10
       kontext "IndividuellePraesentation"
-   '/// close dialog 'Custom Slide Shows' with button 'Close' ///'
+   printlog "close dialog 'Custom Slide Shows' with button 'Close' "
     if IndividuellePraesentation.exists then
        IndividuellePraesentation.Close
     else
        Warnlog "'IndividuellePraesentation' was closed :-("
     end if
 
-   '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
+   printlog "Set Start with current page back to default = on, in ToolsOptions "
    setStartCurrentPage(TRUE)
-   '/// close the application ///'
+   printlog "close the application "
          Kontext "Navigator"
       if Navigator.exists then
-         '///+ close navigator ! ///'
+         printlog "close navigator ! "
          Navigator.Close
       else
          printlog "Navigator: NOT available"
@@ -879,33 +881,33 @@ testcase tSlideShowSlideTransition
 
    sFile = ConvertPath (gOfficePath + "user\work\diashow")
 
-'   '/// open application ///'
+   printlog "open application "
     call hNewDocument
 
-   '/// close the navigator///'
+   printlog "close the navigator"
    Kontext "Navigator"
    if Navigator.Exists then Navigator.Close
    WaitSlot (3000)
-   '/// create 3 slides with a rectangle ///'
+   printlog "create 3 slides with a rectangle "
    hRechteckErstellen (30,30,60,60)
    for i = 1 to 2
-      '///+  - Insert->Slide ///'
+      printlog " Insert->Slide "
       WaitSlot (1000)
       InsertSlide
       WaitSlot (2000)
       hTypekeys "<Pagedown>"
       WaitSlot (2000)
-      '///+ - insert rectangle///'
+      printlog " insert rectangle"
       hRechteckErstellen (30,30,60,60)
    next i
    Printlog "created 3 slides"
-   '/// for all 3 slides do: ///'
+   printlog "for all 3 slides do: "
    for i = 1 to 3
-      '///+ -  open navigator with shortcutkey [MOD1 SHIFT F5] ///'
+      printlog "open navigator with shortcutkey [MOD1 SHIFT F5] "
       hTypeKeys "<MOD1 SHIFT F5>"
          Sleep (3)
          Kontext "NavigatorDraw"
-         '///+ -  select the next slide in the list ///'
+         printlog "select the next slide in the list "
          if Liste.GetItemCount < 3 then
             warnlog "We have " + Liste.GetItemCount + " entries in the Navigator."
             hTypeKeys "<MOD1 SHIFT F5>"
@@ -913,21 +915,21 @@ testcase tSlideShowSlideTransition
             Kontext "NavigatorDraw"
          end if
          Liste.Select i
-         '///+ - press key [return] ///'
+         printlog "press key [return] "
          Liste.TypeKeys "<return>"
          Kontext "Navigator"
-      '///+ -  close Navigator ///'
+      printlog "close Navigator "
       Navigator.Close
-      '///+ -  SlideShow->SlideTransition ///'
+      printlog " SlideShow->SlideTransition "
       SlideShowSlideTransition
          Kontext "Tasks" '"SlideTransition"' "OL_DIA_Diawechsel"  'OL_DIA_Diawechsel
          TransitionAutomaticPreview.UnCheck
-         '///+ -  click button 'Effects' ///'
+         printlog "click button 'Effects' "
          TransitionApplyToSelectedSlide.typekeys "<pagedown>"
          Sleep (1)
-         '///+ -  in the listbox 'speed' select the i. one from the top ///'
+         printlog "in the listbox 'speed' select the i. one from the top "
          TransitionSpeed.Select i
-         '///+ -  Select an effect-group from the listbox ///'
+         printlog "Select an effect-group from the listbox "
          TransitionApplyToSelectedSlide.typekeys "<home>"
          for q= 1 to (i+2)
             Sleep (2)
@@ -935,12 +937,13 @@ testcase tSlideShowSlideTransition
             Sleep (2)
          next q
          sEffect(i) = TransitionApplyToSelectedSlide.GetSelText
-         '///+ -  click button 'Extras' ///'
+         printlog "click button 'Extras' "
          Sleep (2)
+         printlog "click button 'Automatic Transition' "
          select case i
-            case 1: '///+ - + click button 'Automatic Transition' ///'
+            case 1: 
                     TransitionAutomaticallyAfter.Check
-                    '///+ -  + +  Set Time to '00:00:01' OR ///'
+                    printlog " Set Time to '00:00:01' OR "
                     TransitionAutomaticallyAfterTime.ToMin 'SetText "1" '"00:00:01"
                     TransitionAutomaticallyAfterTime.More
 		            TransitionApplyToSelectedSlide.typekeys "<DOWN>"
@@ -948,8 +951,8 @@ testcase tSlideShowSlideTransition
                     TransitionAutomaticallyAfter.Check
                     Tasks.TypeKeys "<TAB><TAB><TAB>"
                     TimerValue = TransitionAutomaticallyAfterTime.GetText
-		    printlog "   TimerValue is now: " + TimerValue
-            case else: '///+ - + click button 'SemiAutomatic Transition' OR ///'
+		    printlog "TimerValue is now: " + TimerValue
+            case else: printlog "click button 'SemiAutomatic Transition' OR "
                     TransitionOnMouseClick.Check
          end select
        Sleep (3)
@@ -958,26 +961,26 @@ testcase tSlideShowSlideTransition
 
    Kontext "DocumentImpress"
    Sleep (3) 
-   '/// SlideShow->Slide Show Settings... ///'
+   printlog "SlideShow->Slide Show Settings... "
    SlideShowPresentationSettings
       Kontext "Bildschirmpraesentation"
       WaitSlot (2000)
-      '/// check Radio button 'Type': 'Window' ///'
+      printlog "check Radio button 'Type': 'Window' "
       Fenster.Check
-   '/// close dialog 'Slide Show' ///'
+   printlog "close dialog 'Slide Show' "
    Bildschirmpraesentation.OK
    WaitSlot (5000)
    Kontext "DocumentImpress"
-   Printlog "'/// SlideShow->Slide Show ///'"
+   Printlog "printlog SlideShow->Slide Show"
    SlideShowSlideshow
-   '/// wait 10 sec ///'
-   sleep (10) 'WaitSlot (10000)
+   printlog "wait 10 sec "
+   sleep (10) 
    Kontext "DocumentPresentation"
-   '/// type key [ESCAPE] ///'
+   printlog "type key [ESCAPE] "
    DocumentPresentation.TypeKeys "<ESCAPE>"
    WaitSlot (3000)
    try
-      '/// type key [F11] to open the stylist (to check ending of presenation) ///'
+      printlog "type key [F11] to open the stylist (to check ending of presenation) "
       if lcase(gPlatform) = "osx" then
           hTypekeys "<mod1 t>"
       else
@@ -986,7 +989,7 @@ testcase tSlideShowSlideTransition
       Sleep (3)
       Kontext "Gestalter"
       Sleep (3)
-      '/// close Stylist ///'
+      printlog "close Stylist "
       Gestalter.Close
       Printlog "- Slideshow worked"
    catch
@@ -996,34 +999,33 @@ testcase tSlideShowSlideTransition
       Sleep (2)
    endcatch
 
-   '/// close the navigator///'
+   printlog "close the navigator"
    Kontext "Navigator"
    if Navigator.Exists then Navigator.Close
-   Printlog "'///+ check the settings in SlideView in the Dia object bar ///'"
+   Printlog "check the settings in SlideView in the Dia object bar "
    for i = 1 to 3
       Printlog " --------------------- " + i + " ---------------------------"
-      '///+ -  open navigator with shortcutkey [MOD1 SHIFT F5] ///'
+      printlog " open navigator with shortcutkey [MOD1 SHIFT F5] "
       hTypeKeys "<MOD1 SHIFT F5>"
          sleep (3)
          Kontext "NavigatorDraw"
-         '///+ -  select the next slide in the list ///'
+         printlog " select the next slide in the list "
          Liste.Select i
-         '///+ - press key [return] ///'
+         printlog " press key [return] "
          Liste.TypeKeys "<return>"
          Kontext "Navigator"
-      '///+ -  close Navigator ///'
+        printlog " close Navigator "
       Navigator.Close
-      '///+ - View->Master View->Slides View ///'
-'      ViewWorkspaceSlidesView
+      printlog " View->Master View->Slides View "
       Sleep (2)
-      Kontext "Tasks" 'SlideViewObjectbar"
-      '///+ - check 'speed' ///'
+      Kontext "Tasks" 
+      printlog "  check 'speed' "
       if Tasks.Exists = TRUE AND Tasks.IsVisible = TRUE then
          x = TransitionSpeed.GetSelIndex  'TransitionSpeed
          if (x <> i) then
             Warnlog "Speed changed :-( is: '" + x + "' should be: '" + i + "'"
          end if
-         '///+ - check 'Transition' ///'
+         printlog " check 'Transition' "
          x = TransitionApplyToSelectedSlide.GetSelIndex 'Diawechsel.GetSelIndex
          if (x <> (i+3)) then
             Warnlog "Transition changed :-( is: '" + x + "' should be: '" + (i+3) + "'"
@@ -1033,65 +1035,64 @@ testcase tSlideShowSlideTransition
             end if
          end if
 
-         '///+ - check 'effect group' ///'
+         printlog "  check 'effect group' "
          sTemp = TransitionApplyToSelectedSlide.GetSelText
          x = inStr (sTemp,sEffect(i))
          Printlog " Effect tried :-) '" + x + "'"
          if (x < 1) then
             printlog "the string '" + sTemp + "' should contain the words(s): '" + sEffect(i) + "'"
          end if
-'         ViewWorkspaceDrawingView
       else
          warnlog "   SlideViewObjectbar doesnt exists or isnt visible"
       end if
    next i
-   '/// save file as presentation with name '"user\\work\\diashow")' ///'
+   printlog "save file as presentation with name 'user\work\diashow)' "
 
     hFileSaveAsWithFilterKill ((sFile + ".odp") , "impress8" )
     
    Printlog "   saved presentation: '" + sFile + "'"  '." + gImpressFilter + "
-   '/// close application///'
+   printlog "close application"
    hCloseDocument ()
    WaitSlot (10000)
-   '/// load file again ///'
+   printlog "load file again "
    hFileOpen (sFile + ".odp")
    WaitSlot (5000)
-   Printlog "   '/// check setings for every slide in the transition dialog ///'"
-   '///+ for all 3 slides do: ///'
+   Printlog "check setings for every slide in the transition dialog "
+   printlog "  for all 3 slides do: "
    for i = 1 to 3
-      Printlog " --------------------- " + i + " ---------------------------"
-      '///+ -  open navigator with shortcutkey [MOD1 SHIFT F5] ///'
-      hTypeKeys "<MOD1 SHIFT F5>"
-         Sleep (3)
-         Kontext "NavigatorDraw"
-         '///+ -  select the next slide in the list ///'
-         Liste.Select i
-         '///+ - press key [return] ///'
-         Liste.TypeKeys "<return>"
-         Kontext "Navigator"
-      '///+ -  close Navigator ///'
-      Navigator.Close
-      '///+ -  select the grafik with the key [TAB] ///'
-      hTypeKeys ("<tab>")
-      '///+ -  SlideShow->SlideTransition ///'
-      SlideShowSlideTransition
+        Printlog " --------------------- " + i + " ---------------------------"
+        printlog " open navigator with shortcutkey [MOD1 SHIFT F5] "
+        hTypeKeys "<MOD1 SHIFT F5>"
+        Sleep (3)
+        Kontext "NavigatorDraw"
+        printlog " select the next slide in the list "
+        Liste.Select i
+        printlog " press key [return] "
+        Liste.TypeKeys "<return>"
+        Kontext "Navigator"
+        printlog " close Navigator "
+        Navigator.Close
+        printlog " select the grafik with the key [TAB] "
+        hTypeKeys ("<tab>")
+        printlog " SlideShow->SlideTransition "
+        SlideShowSlideTransition
          Kontext "Tasks"
          Sleep (1)
-         '///+ - check 'speed' ///'
+         printlog " check 'speed' "
          x = TransitionSpeed.GetSelIndex
          if (x <> i) then
             Warnlog "   Speed changed :-( is: '" + x + "' should: '" + i + "'"
          end if
-      '///+ - check 'effect group' ///'
+        printlog " check 'effect group' "
          x = TransitionApplyToSelectedSlide.GetSelIndex
          if (x <> (i+3)) then
             Warnlog "   Effect changed :-( is: '" + x + "' should: '" + (i+3) + "'"
          end if
          sleep (1)
          select case i
-            case 1: '///+ - click button 'Automatic Transition' ///'
+            case 1: printlog " click button 'Automatic Transition' "
                     if (TransitionAutomaticallyAfter.IsEnabled) then
-                       '///+ -  + +  Check Time '1' OR ///'
+                       '///+ -  + +  Check Time '1' OR "
                        sTemp = TransitionAutomaticallyAfterTime.GetText
                        if (sTemp <> TimerValue) then
                           Warnlog "   Time is different :-( is: '" + sTemp + "' should be: '" + TimerValue + "'" '"00:00:01"
@@ -1100,27 +1101,27 @@ testcase tSlideShowSlideTransition
                        Warnlog "   button 'Automatic Transition' not pressed ?"
                     end if
             case 2: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then
-                       '///+ - + check button 'SemiAutomatic Transition' OR ///'
+                       '///+ - + check button 'SemiAutomatic Transition' OR "
                        Warnlog "   button 'Automatic Transition' is pressed ?"
                     end if
             case 3: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then
-                      '///+ - + click button 'Manual Transition' ///'
+                      '///+ - + click button 'Manual Transition' "
                        Warnlog "   button 'Automatic Transition' is pressed ?"
                     end if
          end select
       Sleep (3)
    next i
    TransitionAutomaticPreview.Check
-   '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
+   printlog "Set Start with current page back to default = on, in ToolsOptions "
    setStartCurrentPage(TRUE)
    Kontext "Navigator"
    if Navigator.exists then
-      '///+ close navigator ! ///'
+      printlog " close navigator ! "
       Navigator.Close
    else
       printlog "Navigator: NOT available"
    end if
-   '/// Close the document ///'
+   printlog "Close the document "
    call hCloseDocument
    
 endcase 'tSlideShowSlideTransition
@@ -1140,7 +1141,7 @@ testcase tSlideShowShowHideSlide
     saSlideNames(3) = S3
     saSlideNames(4) = S4
 
-    printlog "Open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides)"
+    printlog "Open file 'graphics\input\diashow.odp' (Slide Show with 4 Slides)"
     hFileOpen   ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
     sleep (10)
     printlog "check if the document is writable"
@@ -1190,7 +1191,7 @@ testcase tSlideShowShowHideSlide
     SlideShowSlideshow
     sleep (1)
     kontext "DocumentPresentation"
-    printlog "type the key [MOD1 SHIFT F5] to open the navigator" '--------------------------------------------------------------------------
+    printlog "type the key [MOD1 SHIFT F5] to open the navigator" 
     DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
     sleep (1)
     kontext "NavigatorDraw"
@@ -1241,4 +1242,4 @@ testcase tSlideShowShowHideSlide
     
 endcase 'tSlideShowShowHideSlide
 
-'------------------------------------------------------------------------------
+'------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
index b15beb28932d..2df33261c6f2 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
@@ -30,33 +30,29 @@
 '* short description :
 '*
 '*******************************************************************
-'*
-' #1 tPraesentationAnimation
-' #1 tPraesentationEffekt
-' #1 tSlideShowInteraction
-' #1 tAendernObjektBenennen
-' #1 tSlideshowBackgroundAllSlides
-' #1 tSlideshowBackgroundSelectedSlide
-'*
-'\******************************************************************
 
 testcase tPraesentationAnimation
+
     Dim i
-    Printlog "- Slideshow/Animation"
 
+    Printlog "- Slideshow/Animation"
+    printlog "new document "
     Call hNewDocument
-    Call sSelectEmptyLayout									'/// new document  ///'
-  sleep 2
-    InsertGraphicsFromFile								'/// insert graphic ///'
-     Kontext "OeffnenDlg"
-     Dateiname.SetText ConvertPath (gTesttoolPath + "global/input/graf_inp/desp.bmp")
-     sleep 2
-     Oeffnen.Click
-     sleep 2
+    Call sSelectEmptyLayout
+    sleep 2
+    printlog "insert graphic"
+    InsertGraphicsFromFile
+    Kontext "OeffnenDlg"
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global/input/graf_inp/desp.bmp")
+    sleep 2
+    Oeffnen.Click
+    sleep 2
 
-  gMouseClick 90,90									'/// deselect graphic ///'
+    printlog "deselect graphic"
+  gMouseClick 90,90									
 
-  InsertGraphicsFromFile								'/// insert 2nd graphic ///'
+  printlog "insert 2nd graphic"
+  InsertGraphicsFromFile								
   Kontext "OeffnenDlg"
   Dateiname.SetText ConvertPath (gTesttoolPath + "global/input/graf_inp/borabora.jpg")
   sleep 2
@@ -65,15 +61,18 @@ testcase tPraesentationAnimation
 
   Call hTypekeys "<TAB>"
 
-  Opl_SD_EffekteZulassen						                '/// open animation dialogue ///'
+    printlog "open animation dialogue"
+  Opl_SD_EffekteZulassen						                
   Kontext "Animation"
 
     for i=1 to 10
-        BildAufnehmen.Click								'/// add graphic 10 times ///'
+        printlog "add graphic 10 times"
+        BildAufnehmen.Click								
     next i
 
     sleep 1
-     if AnzahlBilder.GetText <> "10" Then						'/// get number of frames (should be 10)  ///'
+    printlog "get number of frames (should be 10) "
+     if AnzahlBilder.GetText <> "10" Then						
         WarnLog "  - Adding pictures did not work"
      else
         PrintLog "  Pictures added"
@@ -81,52 +80,63 @@ testcase tPraesentationAnimation
 
      if AlleAufnehmen.IsEnabled Then WarnLog "  - Add all should not be enabled because only 1 object is selected"
 
-  Kontext "DocumentImpress"
-  EditSelectAll							'/// select both graphics in document  ///'
+    Kontext "DocumentImpress"
+    printlog "select both graphics in document "
+    EditSelectAll
 
-  Kontext "Animation"
+    Kontext "Animation"
 
+    printlog "add them 5 times (10 frames)"
     for i=1 to 5
-    printlog i
-        AlleAufnehmen.Click								'/// add them 5 times (10 frames) ///'
+        printlog i
+        AlleAufnehmen.Click								
     next i
 
     sleep 1
-     if AnzahlBilder.GetText <> "20" Then						'/// compare total numbers of frame ///'
+    printlog "compare total numbers of frame"
+     if AnzahlBilder.GetText <> "20" Then						
         WarnLog "  - Adding pics does not work"
      else
         PrintLog "  all pics added"
      end if
 
-  ErstesBild.Click									'/// jump to 1st frame ///'
+     printlog "jump to 1st frame"
+  ErstesBild.Click									
 
-     if AnzahlBilder.GetText <> "1" Then						'/// get number index of selected frame ///'
+    printlog "get number index of selected frame"
+     if AnzahlBilder.GetText <> "1" Then						
         WarnLog "  - Jump back to beginning does not work"
      else
         PrintLog "  Jump back to beginning works"
      end if
 
-  LetztesBild.Click									'/// jump to last frame ///'
+    printlog "jump to last frame"
+    LetztesBild.Click
 
-     if AnzahlBilder.GetText <> "20" Then						'/// control number index of selected frame ///'
+    printlog "control number index of selected frame"
+    if AnzahlBilder.GetText <> "20" Then
         WarnLog "  - Jump to end does not work"
      else
         PrintLog "  Jumped to end"
      end if
    sleep 1
-  Abspielen.Click									'/// play animation ///'
+   printlog "play animation"
+  Abspielen.Click									
     sleep 10
   Kontext "DocumentImpress"
-  EditSelectAll							'/// delete graphics in document  ///'
+  printlog "delete graphics in document "
+  EditSelectAll							
   DocumentImpress.TypeKeys "<DELETE>"
   sleep 2
   Kontext "Animation"
-  Erstellen.Click									'/// create animation ///'
+  printlog "create animation"
+  Erstellen.Click									
   sleep 10
 
   Kontext "DocumentImpress"
     try
-       EditCopy										'/// try to copy created animation to make sure it is created ///'
+        printlog "try to copy created animation to make sure it is created"
+       EditCopy										
        PrintLog "  Animation created"
     catch
        WarnLog "  - Animation not created"
@@ -134,7 +144,8 @@ testcase tPraesentationAnimation
 
   Kontext "Animation"
 
-     if AnimationsgruppeGruppenobjekt.IsChecked = True Then				'/// set duration time of frames ///'
+  printlog "set duration time of frames"
+     if AnimationsgruppeGruppenobjekt.IsChecked = True Then				
         try
             AnzeigedauerProBild.SetText "1"
             WarnLog "  - Control should be disabled"
@@ -143,11 +154,14 @@ testcase tPraesentationAnimation
         endcatch
      end if
 
-  AnimationsgruppeBitmapobjekt.Check							'/// check group object ///'
+     printlog "check group object"
+  AnimationsgruppeBitmapobjekt.Check							
 
-  AnzeigedauerProBild.SetText "3"							'/// set frame visibility time to 3 ///'
+  printlog "set frame visibility time to 3"
+  AnzeigedauerProBild.SetText "3"							
   SetClipboard AnzeigedauerProBild.GetText
-  AnzeigedauerProBild.More								'/// raise value for frame time ///'
+  printlog "raise value for frame time"
+  AnzeigedauerProBild.More								
    if AnzeigedauerProBild.GetText<> GetClipboardText Then
       PrintLog "  Duration per frame works"
    else
@@ -155,7 +169,8 @@ testcase tPraesentationAnimation
    end if
 
   Dim Zaehler
-  Zaehler = AnzahlDurchlaeufe.GetItemCount						'/// test different settings for pass amount ///'
+  printlog "test different settings for pass amount"
+  Zaehler = AnzahlDurchlaeufe.GetItemCount						
    for i=1 to Zaehler
        AnzahlDurchlaeufe.Select i
    next i
@@ -167,36 +182,43 @@ testcase tPraesentationAnimation
        Anpassung.Select i
    next i
 
- BildLoeschen.Click									'/// delete 1 frame ///'
+   printlog "delete 1 frame"
+ BildLoeschen.Click									
   if AnzahlBilder = "20" Then
      WarnLog "  - Deleting pictures does not work"
   else
      PrintLog "  Picture No.20 deleted"
   end if
 
- AlleLoeschen.Click									'/// delete all frames ///'
+  printlog "delete all frames"
+ AlleLoeschen.Click									
  Kontext "Active"
  Active.Yes
  sleep 3
 
  Kontext "Animation"
-  if Abspielen.IsEnabled = true Then							'/// check if play button is still active ///'
+ printlog "check if play button is still active"
+  if Abspielen.IsEnabled = true Then							
     WarnLog "  - Not all pics are deleted"
   else
     PrintLog "  All pics deleted"
   end if
  sleep 2
- Animation.Close									'/// close animation flyer ///'
+ printlog "close animation flyer"
+ Animation.Close									
  sleep 2
- Call hCloseDocument									'/// close document  ///'
-endcase
+ printlog "close document "
+ Call hCloseDocument									
+endcase 'tPraesentationAnimation
 
 '---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tPraesentationEffekt
+
     qaerrorlog "Test not yet ready."
     goto endsub
-    Printlog "- Slideshow/Effect"
+
+    
  Dim i
  Dim j
  Dim k
@@ -208,11 +230,14 @@ testcase tPraesentationEffekt
  Dim ZaehlerText
  Dim ZaehlerTon
  Dim Zufall
- Call hNewDocument									'/// new document  ///'
-  '///  check state of navigator ! expected: closed ///'
+
+ Printlog "- Slideshow/Effect"
+ printlog "new document "
+ Call hNewDocument									
+  printlog " check state of navigator ! expected: closed"
    Kontext "Navigator"
    if Navigator.exists then
-      '///+ close navigator ! ///'
+      printlog " close navigator !"
       Navigator.Close
       Warnlog "Navigator was open. Check earlier tests. Now closed."
    else
@@ -221,17 +246,22 @@ testcase tPraesentationEffekt
  sleep 2
  kontext "DocumentImpress"
  gMouseClick 50,50
- hRechteckErstellen (20,20,50,50)							'/// create rectangle ///'
+ printlog "create rectangle"
+ hRechteckErstellen (20,20,50,50)							
   sleep 3
   Kontext "Effekt"
     Printlog "  - Test effects"
-  gMouseClick 90,90									'/// deselect rectangle ///'
+    printlog "deselect rectangle"
+  gMouseClick 90,90									
   sleep 1
-  DocumentImpress.TypeKeys "<TAB>"							'/// select rectangle  ///'
+  printlog "select rectangle "
+  DocumentImpress.TypeKeys "<TAB>"							
   sleep 1
-  DocumentImpress.TypeKeys "<F2>"							'/// go into text edit mode (F2) ///'
+  printlog "go into text edit mode (F2)"
+  DocumentImpress.TypeKeys "<F2>"							
   sleep 1
-  DocumentImpress.TypeKeys "test text to test text effects"				'/// type text into the rectangle ///'
+  printlog "type text into the rectangle"
+  DocumentImpress.TypeKeys "test text to test text effects"				
   sleep 1
   DocumentImpress.TypeKeys "<ESCAPE>"
   sleep 2
@@ -242,7 +272,8 @@ testcase tPraesentationEffekt
   sleep 3
   Effekte.Click
   Zaehler=Effekteliste.GetItemCount
-    for i=2 to Zaehler                              '/// Start from the second entry since the first one is "No effect" ///'
+    printlog "Start from the second entry since the first one is No effect"
+    for i=2 to Zaehler                              
     Effekteliste.Select i
     SetClipboard Effekteliste.GetSelText
     Effekt.TypeKeys "<TAB>"
@@ -398,7 +429,7 @@ testcase tPraesentationEffekt
   Effekt.Close
  sleep 1
  Call hCloseDocument
-endcase
+endcase 'tPraesentationEffekt
 
 '---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -410,14 +441,15 @@ testcase tSlideShowInteraction
 
    Datei$ = ConvertPath (gOfficePath + "user\work\interac.odp")
 
-   '/// open application ///'
+   printlog "open application"
    Call hNewDocument
    Call sSelectEmptyLayout
    sleep 5
-   setStartCurrentPage(TRUE)   '/// Set "start with current page to ON ///'
+   printlog "Set start with current page to ON"
+   setStartCurrentPage(TRUE)   
 
-   '/// call 'Insert->Slide' three times and name the slides 2, 3, 4 and create a rectangl� on it  ///'
-   '///+ we now have 4 slides ?! :-) ///'
+   printlog "call 'Insert->Slide' three times and name the slides 2, 3, 4 and create a rectangle on it "
+   printlog "we now have 4 slides"
    Kontext "DocumentImpress"
    for i = 2 to 4
       InsertSlide
@@ -430,7 +462,7 @@ testcase tSlideShowInteraction
       sleep 2
    next i
 
-   '///  check state of navigator ! expected: closed -> open navigator ///'
+   printlog " check state of navigator ! expected: closed -> open navigator"
    Kontext "Navigator"
    if Navigator.exists then
       qaerrorlog "Navigator: already open :-("
@@ -442,7 +474,7 @@ testcase tSlideShowInteraction
    endif
    sleep 3
 
-   '/// Slide Show->Interaction ///'
+   printlog "Slide Show->Interaction"
    SlideShowInteraction
       Kontext "TabInteraktion"
       sleep 1
@@ -658,7 +690,7 @@ testcase tSlideShowInteraction
        endif
          sleep 6
 
-   '/// Do Page down + Page up due to focusing-problems ///'
+   printlog "Do Page down + Page up due to focusing-problems"
    kontext "Slides"
    hTypeKeys "<PAGEDOWN>"
    hTypeKeys "<PAGEUP>"
@@ -828,20 +860,21 @@ testcase tSlideShowInteraction
       endcatch
 
    Kontext "DocumentImpress"
-   '/// Close the Navigator ///'
+   printlog "Close the Navigator"
    DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"
    sleep 3
-   '/// Set "start with current page to ON = Default ///'
+   printlog "Set start with current page to ON = Default"
    setStartCurrentPage(TRUE)
    Call hCloseDocument
-endcase
+endcase 'tSlideShowInteraction
 
 '---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tAendernObjektBenennen
   Printlog "- Context/Name object"
+  printlog "new document "
  Call hNewDocument
- Call sSelectEmptyLayout									'/// new document  ///'
+ Call sSelectEmptyLayout									
 
   sleep 1
   Kontext "DocumentImpress"
@@ -900,7 +933,7 @@ testcase tAendernObjektBenennen
    sleep 2
    Call hCloseDocument
    sleep 2
-endcase
+endcase 'tAendernObjektBenennen
 
 '---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -912,23 +945,23 @@ testcase tSlideshowBackgroundAllSlides
     Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
     Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
 
-    '/// Create a new document ///'
+    printlog "Create a new document"
     Printlog "- SlideshowBackground"
     Call hNewDocument
 
-    '/// Insert a new Slide ///'
+    printlog "Insert a new Slide"
     Kontext "DocumentImpress"
     InsertSlide
 
-    '/// Open the Contextmenu ///'
+    printlog "Open the Contextmenu"
     DocumentImpress.OpenContextMenu  
 
-    '/// Select the entry "Slide" ///'
+    printlog "Select the entry Slide"
     hMenuFindSelect (".uno:PageMenu", true, 1, true)
-    '/// Select the entry "Background" ///'
+    printlog "Select the entry Background"
     hMenuSelectNr (4)
 
-    '/// In the open-file dialogue, choose and open a graphic-file you wish to have as a background ///'
+    printlog "In the open-file dialogue, choose and open a graphic-file you wish to have as a background"
     kontext "GrafikEinfuegenDlg"
     If GrafikEinfuegenDlg.Exists Then
         DateiName.SetText (Background$)
@@ -937,7 +970,7 @@ testcase tSlideshowBackgroundAllSlides
         warnlog "GrafikEinfuegenDlg not existent... check why."
     End if
 
-    '/// If an "active"-message shows up, press "yes" to apply this background to all slides. ///'
+    printlog "If an active-message shows up, press yes to apply this background to all slides."
     kontext "Active"
     if Active.Exists then
         Active.Yes
@@ -945,43 +978,45 @@ testcase tSlideshowBackgroundAllSlides
         QaErrorLog "No dialogue considering if we wish to apply the background to all slides."
     end if
 
-    '/// Save the document ///'
+    printlog "Save the document"
     Call hFileSaveAsKill (Datei$)
-    '/// Close the document ///'
+    printlog "Close the document"
     Call hCloseDocument
-    '/// Open the document ///'
+    printlog "Open the document"
     Call hFileOpen (Datei$)
-    '/// Close the document ///'
+    printlog "Close the document"
     Call hCloseDocument
-endcase
+endcase 'tSlideshowBackgroundAllSlides
 
 '---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tSlideshowBackgroundSelectedSlide
+
     Dim Datei$ as string
     Dim Background$ as string
     Dim i as integer
     Dim Zaehler as integer
+
     Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
     Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
 
-    '/// Create a new document ///'
+    printlog "Create a new document"
     Printlog "- SlideshowBackground"
     Call hNewDocument
 
-    '/// Insert a new Slide ///'
+    printlog "Insert a new Slide"
     Kontext "DocumentImpress"
     InsertSlide
 
-    '/// Open the Contextmenu ///'
+    printlog "Open the Contextmenu"
     DocumentImpress.OpenContextMenu  
 
-    '/// Select the entry "Slide" ///'
+    printlog "Select the entry Slide"
     hMenuFindSelect (".uno:PageMenu", true, 1, true)
-    '/// Select the entry "Background" ///'
+    printlog "Select the entry Background"
     hMenuSelectNr (4)
 
-    '/// In the open-file dialogue, choose and open a graphic-file you wish to have as a background ///'
+    printlog "In the open-file dialogue, choose and open a graphic-file you wish to have as a background"
     kontext "GrafikEinfuegenDlg"
     If GrafikEinfuegenDlg.Exists Then
         DateiName.SetText (Background$)
@@ -990,7 +1025,7 @@ testcase tSlideshowBackgroundSelectedSlide
         warnlog "GrafikEinfuegenDlg not existent... check why."
     End if
 
-    '/// If an "active"-message shows up, press "No" to only apply this background to the selected slide. ///'
+    printlog "If an active-message shows up, press No to only apply this background to the selected slide."
     kontext "Active"
     if Active.Exists then
         Active.No
@@ -998,14 +1033,14 @@ testcase tSlideshowBackgroundSelectedSlide
         QaErrorLog "No dialogue considering if we wish to apply the background to all slides."
     end if
 
-    '/// Save the document ///'
+    printlog "Save the document"
     Call hFileSaveAsKill (Datei$)
-    '/// Close the document ///'
+    printlog "Close the document"
     Call hCloseDocument
-    '/// Open the document ///'
+    printlog "Open the document"
     Call hFileOpen (Datei$)
-    '/// Close the document ///'
+    printlog "Close the document"
     Call hCloseDocument
-endcase
+endcase 'tSlideshowBackgroundSelectedSlide
 
-'---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+'---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
index bc138fef445d..07ac2f0d9def 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
@@ -30,125 +30,140 @@
 '* short description :
 '*
 '*******************************************************************
-' #1 tExtrasInteraktion
-' #1 tExtrasEffekt
-' #1 tExtrasPraesentationseinstellungen
-' #1 tExtrasIndividuellePraesentation
-' #1 tExtrasInteraktion
-' #1 tSlideshowContextMenuOneSlide
-' #1 tSlideshowContextMenuMoreSlides
-' #1 tiMousePointerHides
-'\******************************************************************
 
 testcase tExtrasInteraktion
+
+    Dim i
+    Dim Zaehler
+
+
     Printlog " -  SlideShow/Interaction"
- Call hNewDocument
- Call sSelectEmptyLayout
- sleep 1
- Call hTextrahmenErstellen ("Seite 1",10,10,40,40)		'/// create textbox ///'
- SlideShowPresentationSettings							'/// Set slide show settings ///'
- Kontext "Bildschirmpraesentation"
- NavigatorSichtbar.Check								'/// Navigator visible ///'
- Bildschirmpraesentation.OK
- SlideShowInteraction									'/// open Interaction ///'
- Kontext "Interaktion"
- if Interaktion.exists(5)then
-    AktionBeiMausklick.Select 1							'/// Select "Go to previous slide" ///'
- else
-    Print "Interaction doesnt exist, something is wrong here."
- endif
- Interaktion.OK
- Kontext "DocumentImpress"
- SlideShowSlideshow								        '/// Run slideshow ///'
- Sleep (2)
- Kontext "DokumentPraesentation"
- DokumentPraesentation.TypeKeys "<ESCAPE>"
- Sleep 2
- Kontext "DocumentImpress"
- gMouseClick 20,20
- EditSelectAll
-  try
-     EditCopy
-     Printlog "  Interaction ->No action works"
-     Kontext "DocumentImpress"
-  catch
-     Warnlog "  - Interaction->does not work properly: Should be: Page 2  but it is: " + GetClipboardText
-     DocumentImpress.TypeKeys "<ESCAPE>"
-     Kontext "DocumentImpress"
-  endcatch
- hCloseDocument
- Call hNewDocument
- Call sSelectEmptyLayout
- Call hRechteckErstellen (50,50,80,80)							'/// create rectangle ///'
- SlideShowInteraction
- Kontext "Interaktion"
- Dim i
- Dim Zaehler
- Zaehler=AktionBeiMausklick.GetItemCount
-  For i=2 to Zaehler
-      AktionBeiMausklick.Select i							'/// select actions ///'
-      SetClipboard AktionBeiMausklick.GetSelText
-      Interaktion.OK
-      Kontext "DocumentImpress"
-      EditSelectAll
-      SlideShowInteraction
-      Kontext "Interaktion"
+    Call hNewDocument
+    Call sSelectEmptyLayout
+    sleep 1
+    printlog "create textbox"
+    Call hTextrahmenErstellen ("Seite 1",10,10,40,40)
+    printlog "Set slide show settings"
+    SlideShowPresentationSettings
+    Kontext "Bildschirmpraesentation"
+    printlog "Navigator visible"
+    NavigatorSichtbar.Check
+    Bildschirmpraesentation.OK
+    printlog "open Interaction"
+    SlideShowInteraction
+    Kontext "Interaktion"
+    if Interaktion.exists(5)then
+        printlog "Select Go to previous slide"
+        AktionBeiMausklick.Select 1
+    else
+        Print "Interaction doesnt exist, something is wrong here."
+    endif
+    Interaktion.OK
+    Kontext "DocumentImpress"
+    printlog "Run slideshow"
+    SlideShowSlideshow
+    Sleep (2)
+    Kontext "DokumentPraesentation"
+    DokumentPraesentation.TypeKeys "<ESCAPE>"
+    Sleep 2
+    Kontext "DocumentImpress"
+    gMouseClick 20,20
+    EditSelectAll
+    try
+        EditCopy
+        Printlog "  Interaction ->No action works"
+        Kontext "DocumentImpress"
+    catch
+        Warnlog "  - Interaction->does not work properly: Should be: Page 2  but it is: " + GetClipboardText
+        DocumentImpress.TypeKeys "<ESCAPE>"
+        Kontext "DocumentImpress"
+    endcatch
+    hCloseDocument
+
+    Call hNewDocument
+    Call sSelectEmptyLayout
+    printlog "create rectangle"
+    Call hRechteckErstellen (50,50,80,80)
+    SlideShowInteraction
+    Kontext "Interaktion"
+    Zaehler=AktionBeiMausklick.GetItemCount
+    For i=2 to Zaehler
+        printlog "select actions"
+        AktionBeiMausklick.Select i
+        SetClipboard AktionBeiMausklick.GetSelText
+        Interaktion.OK
+        Kontext "DocumentImpress"
+        EditSelectAll
+        SlideShowInteraction
+        Kontext "Interaktion"
+        printlog "control if action is saved (closing reopening dialog)"
         if GetClipboardText<>AktionBeiMausklick.GetSelText Then
-           Warnlog "  Action at mouseclick - " + GetClipboardText + " - not taken"		'/// control if action is saved (closing reopening dialog) ///'
+            Warnlog "  Action at mouseclick - " + GetClipboardText + " - not taken"
         else
-           Printlog "  Action at mouseclick - " + GetClipboardText + " - runs"
+            Printlog "  Action at mouseclick - " + GetClipboardText + " - runs"
         end if
-  next i
-  Interaktion.OK
-   sleep 1
- Call hCloseDocument									'/// close document ///'
-endcase
+    next i
+    Interaktion.OK
+    sleep 1
+    printlog "close document"
+    Call hCloseDocument
+endcase 'tExtrasInteraktion
+
+'-------------------------------------------------------------------------------
 
 testcase tExtrasEffekt
     qaerrorlog "Test not yet ready."
-     goto endsub
- Dim i
- Dim j
- Dim k
- Dim l
- Dim m
- Dim n
- Dim Zaehler
- Dim ZaehlerKmh
- Dim ZaehlerText
- Dim ZaehlerTon
- Dim Zufall
- Call hNewDocument									'/// New impress document ///'
-
-   '///  check state of navigator ! expected: closed ///'
-   Kontext "Navigator"
-   if Navigator.exists then
-      '///+ close navigator ! ///'
-      Navigator.Close
-      Warnlog "Navigator was open. Check earlier tests. Now closed."
-   else
-      printlog "Navigator: NOT available. Good."
-   endif
-
- gMouseClick 50,50
- hRechteckErstellen (20,20,50,50)					'/// create rectangle ///'
- sleep 2
- DocumentImpress.TypeKeys "<F2>"
- DocumentImpress.TypeKeys "- This is text to test the text effects of the Effects flyer"
- sleep 1
- gMouseClick 90,90									'/// deselect rectangle ///'
- DocumentImpress.TypeKeys "<TAB>"							'/// reselect rectangle ///'
-
-  sleep 1
-  Kontext "Effekt"
+    goto endsub
+    Dim i
+    Dim j
+    Dim k
+    Dim l
+    Dim m
+    Dim n
+    Dim Zaehler
+    Dim ZaehlerKmh
+    Dim ZaehlerText
+    Dim ZaehlerTon
+    Dim Zufall
+
+    printlog "New impress document"
+    Call hNewDocument									
+
+    printlog " check state of navigator ! expected: closed"
+    Kontext "Navigator"
+    if Navigator.exists then
+        printlog " close navigator !"
+        Navigator.Close
+        Warnlog "Navigator was open. Check earlier tests. Now closed."
+    else
+        printlog "Navigator: NOT available. Good."
+    endif
+
+    gMouseClick 50,50
+    printlog "create rectangle"
+    hRechteckErstellen (20,20,50,50)					
+    sleep 2
+    DocumentImpress.TypeKeys "<F2>"
+    DocumentImpress.TypeKeys "- This is text to test the text effects of the Effects flyer"
+    sleep 1
+    printlog "deselect rectangle"
+    gMouseClick 90,90
+    printlog "reselect rectangle"
+    DocumentImpress.TypeKeys "<TAB>"							
+
+    sleep 1
+    Kontext "Effekt"
     Printlog "  - Test effect flyer"
 
-  SlideShowEffects									'/// Open effect flyer ///'
-  Kontext "ExtrasEffekt"
-  sleep 1
-  Effekte.Click
-  Zaehler=Effekteliste.GetItemCount					'/// select each effect 1 time, assign effect and close dialog ///'
-    for i=1 to Zaehler								'/// reopen dialog and check if the effect is still there ///'
+    printlog "Open effect flyer"
+    SlideShowEffects									
+    Kontext "ExtrasEffekt"
+    sleep 1
+    Effekte.Click
+    printlog "select each effect 1 time, assign effect and close dialog"
+    Zaehler=Effekteliste.GetItemCount
+    printlog "reopen dialog and check if the effect is still there"
+    for i=1 to Zaehler								
         Effekteliste.Select i
         SetClipboard Effekteliste.GetSelText
         Effekt.TypeKeys "<TAB>"
@@ -159,15 +174,16 @@ testcase tExtrasEffekt
         SlideShowEffects
         Kontext "Effekt"
         sleep 1
-         if GetClipboardText<>Effekteliste.GetSelText Then Warnlog "  - Invisible color not chosen"
-            printlog GetClipboardText + " should be " + Effekteliste.GetSelText
+        if GetClipboardText<>Effekteliste.GetSelText Then Warnlog "  - Invisible color not chosen"
+        printlog GetClipboardText + " should be " + Effekteliste.GetSelText
 
-            sleep 1
+        sleep 1
     next i
     sleep 2
-  Texteffekte.Click									'/// test text effects ///'
-  sleep 1
-  ZaehlerKmh=Geschwindigkeit.GetItemCount
+    printlog "test text effects"
+    Texteffekte.Click									
+    sleep 1
+    ZaehlerKmh=Geschwindigkeit.GetItemCount
     for j=1 to ZaehlerKmh
         Geschwindigkeit.Select j
         SetClipboard Geschwindigkeit.GetSelText
@@ -176,14 +192,14 @@ testcase tExtrasEffekt
         SlideShowEffects
         Kontext "Effekt"
         sleep 1
-         if GetClipboardText<>Geschwindigkeit.GetSelText Then Warnlog "  - Speed not taken over"
+        if GetClipboardText<>Geschwindigkeit.GetSelText Then Warnlog "  - Speed not taken over"
     next j
-     Printlog "  - Speed test ok"
+    Printlog "  - Speed test ok"
 
-     Printlog "  - Test text effects"
-  Texteffekte.Click
-  sleep 1
-  ZaehlerText=TexteffekteListe.GetItemCount
+    Printlog "  - Test text effects"
+    Texteffekte.Click
+    sleep 1
+    ZaehlerText=TexteffekteListe.GetItemCount
     for k=1 to ZaehlerText
         TexteffekteListe.Select k
         printlog TexteffekteListe.GetSelText + "-effect choosen"
@@ -199,19 +215,19 @@ testcase tExtrasEffekt
         Texteffekte.Click
         printlog "and when we closed the window and opened again... " + TexteffekteListe.GetSelText + " was choosen"
         sleep 1
-         if GetClipboardText<>TexteffekteListe.GetSelText Then Warnlog "  - Texteffect did not changed"
-            sleep 1
+        if GetClipboardText<>TexteffekteListe.GetSelText Then Warnlog "  - Texteffect did not changed"
+        sleep 1
     next k
      Printlog "  - Test invisible color"
-  Effekte.Click
-  Effekteliste.Select 1
-  Effekteauswahl.TypeKeys "<RIGHT>",2
-  Zuweisen.Click
-  sleep 1
-  Extras.Click
-  sleep 1
-  randomize
-  Zufall=((2*Rnd)+1)
+    Effekte.Click
+    Effekteliste.Select 1
+    Effekteauswahl.TypeKeys "<RIGHT>",2
+    Zuweisen.Click
+    sleep 1
+    Extras.Click
+    sleep 1
+    randomize
+    Zufall=((2*Rnd)+1)
     for l=1 to 4
         UnsichtbarMachen.Click
         sleep 1
@@ -222,14 +238,15 @@ testcase tExtrasEffekt
         Kontext "Effekt"
         sleep 1
         Effekteauswahl.TypeKeys "<RIGHT>",2
-        Extras.Click										'/// test extras ///'
+        printlog "test extras"
+        Extras.Click										
         sleep 1
         UnsichtbarMachen.Click
         sleep 1
         Zuweisen.Click
         sleep 1
     next l
-     Printlog "  - Blend with color"
+    Printlog "  - Blend with color"
     sleep 2
     for m=1 to 5
         MitFarbeAbblenden.Click
@@ -251,243 +268,271 @@ testcase tExtrasEffekt
         sleep 1
 '	     if GetClipboardText<>Abblendfarbe.GetSelText Then Warnlog "  - Blendingcolor did not take over"
     next m
-     Printlog "  - Test order"
-  Effekte.Click
-  sleep 1
-  Effekteliste.Select 2
-  Zuweisen.Click
-  Reihenfolge.Click
-  sleep 1
-  sleep 1
-  Printlog "  - test preview window"
-  Vorschaufenster.Click									'/// open preview window ///'
-  sleep 1
-   Kontext "Vorschau"
-      if Vorschau.Exists = False Then Warnlog "  - Preview window not opened"
-   Vorschau.Close
-   Kontext "Effekt"
-   Extras.Click
-    if not Klangliste.IsEnabled Then Klang.Click					'/// insert sound ///'
-   sleep 1
-'  ZaehlerTon=Klangliste.GetItemCount
-   for n=1 to 5
-       SetClipboard Klangliste.GetSelText
-       Klangliste.Select n
-       VollstaendigAbspielen.Click
-       Effekt.Close
-       SlideShowEffects
-       Kontext "Effekt"
-       sleep 1
-       Extras.Click
-       sleep 1
+    Printlog "  - Test order"
+    Effekte.Click
+    sleep 1
+    Effekteliste.Select 2
+    Zuweisen.Click
+    Reihenfolge.Click
+    sleep 1
+    sleep 1
+    Printlog "  - test preview window"
+    printlog "open preview window"
+    Vorschaufenster.Click									
+    sleep 1
+    Kontext "Vorschau"
+    if Vorschau.Exists = False Then Warnlog "  - Preview window not opened"
+    Vorschau.Close
+    Kontext "Effekt"
+    Extras.Click
+    printlog "insert sound"
+    if not Klangliste.IsEnabled Then Klang.Click					
+    sleep 1
+    '  ZaehlerTon=Klangliste.GetItemCount
+    for n=1 to 5
+        SetClipboard Klangliste.GetSelText
+        Klangliste.Select n
+        VollstaendigAbspielen.Click
+        Effekt.Close
+        SlideShowEffects
+        Kontext "Effekt"
+        sleep 1
+        Extras.Click
+        sleep 1
         if GetClipboardText<>Klangliste.GetSelText Then Warnlog "  - sound did not change"
     next n
-   Effekt.Close
-   sleep 1
- Call hCloseDocument												'/// close document ///'
-endcase
+    Effekt.Close
+    sleep 1
+    printlog "close document"
+    Call hCloseDocument												
+endcase 'tExtrasEffekt
+
+'-------------------------------------------------------------------------------
 
 testcase tExtrasPraesentationseinstellungen
-dim waschecked as boolean
-     Printlog "  - SlideShow/Slideshow settings"
-  Call hNewDocument							'/// New impress document ///'
-  setStartCurrentPage(FALSE)                '/// Set ToolsOptions - Presentation - StartCurrentPage = off ///'
-  '///  check state of navigator ! expected: closed ///'
-  Kontext "Navigator"
-  if Navigator.exists then
-     '///+ close navigator ! ///'
-     Navigator.Close
-     Warnlog "Navigator was open. Check earlier tests. Now closed."
-  else
-     printlog "Navigator: NOT available. Good."
-  endif
-  Kontext "DocumentImpress"
-   ExtrasPraesentationseinstellung
-   Kontext "Bildschirmpraesentation"
-   AbDia.Check
-  SetClipboard AbDiaName.GetItemCount
-  Bildschirmpraesentation.OK
-  InsertSlide								'/// insert slide ///'
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  SlideShowPresentationSettings				'/// slideshow settings ///'
-  Kontext "Bildschirmpraesentation"
-   if AbDiaName.GetItemCount <> GetClipboardText Then
-      Printlog "  - Added page appears in list"
-   else
-      Warnlog "  - Page not added to the list"
-   end if
-  AlleDias.Check							'/// check all dias///'
-      Printlog "  - Test all slides"
-  Bildschirmpraesentation.OK
-  hCloseDocument							'/// close document ///'
-    DateiOeffnen							'/// open document (diashow.odp) ///'
-  Kontext "OeffnenDlg"
-  if OeffnenDlg.Exists(10) then
-     Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
-  else
-     Warnlog "Took more then 10 seconds to get the file-open -dialogue open. Ending Test."
-     goto endsub
-  endif
-  Oeffnen.Click
-  sleep (60)
-  ' check if the document is writable
-  if fIsDocumentWritable = false then
-     ' make the document writable and check if it's succesfull
-     if fMakeDocumentWritable = false then
-        warnlog "The document can't be make writeable. Test stopped."
+
+    dim waschecked as boolean
+
+    Printlog "  - SlideShow/Slideshow settings"
+    printlog "New impress document"
+    Call hNewDocument
+    printlog "Set ToolsOptions - Presentation - StartCurrentPage = off"
+    setStartCurrentPage(FALSE)                
+    printlog " check state of navigator ! expected: closed"
+    Kontext "Navigator"
+    if Navigator.exists then
+        printlog " close navigator !"
+        Navigator.Close
+        Warnlog "Navigator was open. Check earlier tests. Now closed."
+    else
+        printlog "Navigator: NOT available. Good."
+    endif
+    Kontext "DocumentImpress"
+    ExtrasPraesentationseinstellung
+    Kontext "Bildschirmpraesentation"
+    AbDia.Check
+    SetClipboard AbDiaName.GetItemCount
+    Bildschirmpraesentation.OK
+    printlog "insert slide"
+    InsertSlide								
+    sleep 2
+    hTypekeys "<Pagedown>"
+    sleep 2
+    printlog "slideshow settings"
+    SlideShowPresentationSettings				
+    Kontext "Bildschirmpraesentation"
+    if AbDiaName.GetItemCount <> GetClipboardText Then
+        Printlog "  - Added page appears in list"
+    else
+        Warnlog "  - Page not added to the list"
+    end if
+    printlog "check all dias"
+    AlleDias.Check							
+    Printlog "  - Test all slides"
+    Bildschirmpraesentation.OK
+    printlog "close document"
+    hCloseDocument
+    printlog "open document (diashow.odp)"
+    DateiOeffnen							
+    Kontext "OeffnenDlg"
+    if OeffnenDlg.Exists(10) then
+        Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
+    else
+        Warnlog "Took more then 10 seconds to get the file-open -dialogue open. Ending Test."
         goto endsub
-     endif
-  endif
-  Kontext "DocumentImpress"
-  sleep 1
-  SlideShowPresentationSettings
-  Kontext "Bildschirmpraesentation"
-   if Fenster.IsChecked = False Then			'/// slideshow runs in window mode checked ///'
-      Fenster.Check
-      Printlog "  - Slideshow in window mode"
-   else
-      Printlog "  - Slideshow in window mode checked"
-   end if
-  Bildschirmpraesentation.OK
+    endif
+    Oeffnen.Click
+    sleep (60)
+    printlog "check if the document is writable"
+    if fIsDocumentWritable = false then
+        printlog "make the document writable and check if it's succesfull"
+        if fMakeDocumentWritable = false then
+            warnlog "The document can't be make writeable. Test stopped."
+            goto endsub
+        endif
+    endif
+    Kontext "DocumentImpress"
+    sleep 1
+    SlideShowPresentationSettings
+    Kontext "Bildschirmpraesentation"
+    printlog "slideshow runs in window mode checked"
+    if Fenster.IsChecked = False Then			
+        Fenster.Check
+        Printlog "  - Slideshow in window mode"
+    else
+        Printlog "  - Slideshow in window mode checked"
+    end if
+    Bildschirmpraesentation.OK
 
     Printlog "  - Testing slide show"
-  SlideShowSlideshow							'/// run slideshow ///'
-  sleep (3)
-  Kontext "DocumentPresentation"
-  DocumentPresentation.TypeKeys "<pagedown>"
-   try
-      Kontext "DocumentImpress"
-      ViewZoom							'/// try using menue entrees (should be disabled while slideshow is running) ///'
-      Warnlog "  - In slide show mode controls shouldn't be enabled"
-      Kontext "Massstab"
-      Massstab.OK
-   catch
-       Kontext "DocumentPresentation"
-       Printlog "  - Slideshow runs"
-   endcatch
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"
-  sleep (5)
-
-  kontext "DocumentPresentation"
-  if DocumentPresentation.Exists(3) then                                '/// test if application is still in slideshow mode ///'
-     warnlog "  - We are still in slideshow mode"
-     DocumentPresentation.TypeKeys "<ESCAPE>"
-     else
-     Printlog "  - Test Abdia page 3 ended"
-  endif
-
-  Printlog "  - From slides test"
-  SlideShowPresentationSettings						'/// open slideshow settings ///'
-  Kontext "Bildschirmpraesentation"
-  Fenster.Check						                '/// check slideshow in window mode ///'
-  AbDia.Check
-  AbDiaName.Select 3							'/// slideshow begins at dia 3///'
-        Printlog "  -  From " + AbDiaName.GetSelText + " was the slides shown"
-  Bildschirmpraesentation.OK
-  SlideShowSlideshow							'/// run slideshow ///'
-  sleep (3)
-  Kontext "DocumentPresentation"
-  DocumentPresentation.TypeKeys "<pagedown>" 'to get to 4
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>" ' to get to the end
-  sleep 2
-  '/// Click once more to get out of presentation-mode ///'
-  DocumentPresentation.TypeKeys "<pagedown>" 'out
-  sleep (3)
-  kontext "DocumentPresentation"
-  if DocumentPresentation.Exists(3) then
-     warnlog "  - We are still in slideshow mode"
-     DocumentPresentation.TypeKeys "<ESCAPE>"
+    printlog "run slideshow"
+    SlideShowSlideshow							
+    sleep (3)
+    Kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<pagedown>"
+    try
+        Kontext "DocumentImpress"
+        printlog "try using menue entrees (should be disabled while slideshow is running)"
+        ViewZoom							
+        Warnlog "  - In slide show mode controls shouldn't be enabled"
+        Kontext "Massstab"
+        Massstab.OK
+    catch
+        Kontext "DocumentPresentation"
+        Printlog "  - Slideshow runs"
+    endcatch
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"
+    sleep (5)
+
+    kontext "DocumentPresentation"
+    printlog "test if application is still in slideshow mode"
+    if DocumentPresentation.Exists(3) then                                
+        warnlog "  - We are still in slideshow mode"
+        DocumentPresentation.TypeKeys "<ESCAPE>"
+    else
+        Printlog "  - Test Abdia page 3 ended"
+    endif
+
+    Printlog "  - From slides test"
+    printlog "open slideshow settings"
+    SlideShowPresentationSettings						
+    Kontext "Bildschirmpraesentation"
+    printlog "check slideshow in window mode"
+    Fenster.Check						                
+    AbDia.Check
+    printlog "slideshow begins at dia 3"
+    AbDiaName.Select 3							
+    Printlog "  -  From " + AbDiaName.GetSelText + " was the slides shown"
+    Bildschirmpraesentation.OK
+    printlog "run slideshow"
+    SlideShowSlideshow							
+    sleep (3)
+    Kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<pagedown>" 'to get to 4
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>" ' to get to the end
+    sleep 2
+    printlog "Click once more to get out of presentation-mode"
+    DocumentPresentation.TypeKeys "<pagedown>" 'out
+    sleep (3)
+    kontext "DocumentPresentation"
+    if DocumentPresentation.Exists(3) then
+        warnlog "  - We are still in slideshow mode"
+        DocumentPresentation.TypeKeys "<ESCAPE>"
      else
-     Printlog "  - Test Abdia page 3 ended"
-  endif
-  Printlog "  - Repeat endless"
-
-  Kontext "DocumentImpress"
-  SlideShowPresentationSettings						'/// open slideshow settings ///'
-  Kontext "Bildschirmpraesentation"
-   if AbDia.IsChecked=True Then AlleDias.Check
-   if Auto.IsChecked=False Then Auto.Check
-  Bildschirmpraesentation.OK
-  sleep (1)
-  SlideShowSlideshow                            'start from 1
-  sleep (3)
-  Kontext "DocumentPresentation"
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 2
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 3
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 4
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to pause
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 1
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 2
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 3
-  sleep 2
-  DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"   '/// Open the navigator ///'
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 4
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to pause
-  sleep 2
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 1
-  sleep 3
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 2
-  sleep 3
-  DocumentPresentation.TypeKeys "<pagedown>"    'to 3
-  sleep 3
-  Kontext "NavigatorDraw"
-  if NavigatorDraw.Exists then
-     Printlog "   The navigator is open. good."
-  else
-     Warnlog "  The navigator should be accessable. Opening now."
-     Kontext "DocumentImpress"
-     DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"
-     Kontext "NavigatorDraw"
-  end if
-  sleep 2
-  if Liste.GetSelIndex <> 3 then
-     Warnlog "  - Diashow not repeated: We should be at page no 3, but we are at page no: " + Liste.GetSelIndex
-     Kontext "DocumentPresentation"
-     DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"            '/// Close the Navigator-window ///'
-  else
-     Printlog "  - Repeat endless does work"
-     Kontext "DocumentPresentation"
-     DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"            '/// Close the Navigator-window ///'
-     sleep 2
-  endif
-  Kontext "DocumentPresentation"
-  DocumentPresentation.TypeKeys "<ESCAPE>"
-  sleep 2
-  Kontext "DocumentImpress"
-  gMouseClick 80,80
-   try
-      SlideShowPresentationSettings					'/// test endless repeating setting ///'
-      Kontext "Bildschirmpraesentation"
-      Bildschirmpraesentation.OK
-      Printlog "  - Repeat endless"
-   catch
-      Warnlog "  - We are still in slideshow mode"
-      DocumentPresentation.TypeKeys "<ESCAPE>"
-      sleep 5
+        Printlog "  - Test Abdia page 3 ended"
+    endif
+    Printlog "  - Repeat endless"
+
+    Kontext "DocumentImpress"
+    printlog "open slideshow settings"
+    SlideShowPresentationSettings						
+    Kontext "Bildschirmpraesentation"
+    if AbDia.IsChecked=True Then AlleDias.Check
+    if Auto.IsChecked=False Then Auto.Check
+    Bildschirmpraesentation.OK
+    sleep (1)
+    SlideShowSlideshow                            'start from 1
+    sleep (3)
+    Kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 2
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 3
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 4
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to pause
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 1
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 2
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 3
+    sleep 2
+    printlog "Open the navigator"
+    DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"   
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 4
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to pause
+    sleep 2
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 1
+    sleep 3
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 2
+    sleep 3
+    DocumentPresentation.TypeKeys "<pagedown>"    'to 3
+    sleep 3
+    Kontext "NavigatorDraw"
+    if NavigatorDraw.Exists then
+        Printlog "   The navigator is open. good."
+    else
+        Warnlog "  The navigator should be accessable. Opening now."
+        Kontext "DocumentImpress"
+        DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"
+        Kontext "NavigatorDraw"
+    end if
+        sleep 2
+    if Liste.GetSelIndex <> 3 then
+        Warnlog "  - Diashow not repeated: We should be at page no 3, but we are at page no: " + Liste.GetSelIndex
+        Kontext "DocumentPresentation"
+        printlog "Close the Navigator-window"
+        DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"            
+    else
+        Printlog "  - Repeat endless does work"
+        Kontext "DocumentPresentation"
+        printlog "Close the Navigator-window"
+        DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"            
+        sleep 2
+    endif
+    Kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<ESCAPE>"
+    sleep 2
+    Kontext "DocumentImpress"
+    gMouseClick 80,80
+    try
+    printlog "test endless repeating setting"
+        SlideShowPresentationSettings					
+        Kontext "Bildschirmpraesentation"
+        Bildschirmpraesentation.OK
+        Printlog "  - Repeat endless"
+    catch
+        Warnlog "  - We are still in slideshow mode"
+        DocumentPresentation.TypeKeys "<ESCAPE>"
+        sleep 5
     endcatch
-   Kontext "DocumentImpress"
+    Kontext "DocumentImpress"
     SlideShowPresentationSettings
     Kontext "BildschirmPraesentation"
     Fenster.Check
-       Printlog "  - Test slide switching manually"				'/// test dia switch manual ///'
+    printlog "test dia switch manual"
+    Printlog "  - Test slide switching manually"				
     if DiawechselManuel.IsChecked = False Then DiawechselManuel.Check
     BildschirmPraesentation.Ok
     sleep 1
@@ -512,42 +557,49 @@ dim waschecked as boolean
     Kontext "Navigator"
     sleep 5
 
-   '///  Check state of navigator ! Expected: closed ///'
-   Kontext "Navigator"
-   if Navigator.exists then
-      '///+ Close Navigator ! ///'
-      Navigator.Close
-      Warnlog "Navigator: Should have been closed. Closing now."
-   else
-      printlog "Navigator: not available - Good"
-   endif
-  Kontext "DokumentPraesentation"
-  DokumentPraesentation.TypeKeys "<ESCAPE>"  '/// Exit presentation-mode ///'
-  Kontext "DocumentImpress"
-  Call hCloseDocument					   '/// close document ///'
-endcase
+    printlog " Check state of navigator ! Expected: closed"
+    Kontext "Navigator"
+    if Navigator.exists then
+        '///+ Close Navigator !"
+        Navigator.Close
+        Warnlog "Navigator: Should have been closed. Closing now."
+    else
+        printlog "Navigator: not available - Good"
+    endif
+    Kontext "DokumentPraesentation"
+    printlog "Exit presentation-mode"
+    DokumentPraesentation.TypeKeys "<ESCAPE>"  
+    Kontext "DocumentImpress"
+    printlog "close document"
+    Call hCloseDocument					   
+endcase 'tExtrasPraesentationseinstellungen
+
+'-------------------------------------------------------------------------------
 
 testcase tExtrasIndividuellePraesentation
     Printlog "- Slideshow/Individual slideshow"
     Call hNewDocument
-    Call sSelectEmptyLayout						'/// new impress document ///'
-     '/// Deactivate "Start with current page" in ToolsOptions ///'
-     setStartCurrentPage(FALSE)
-   '///  check state of navigator ! expected: closed ///'
-   Kontext "Navigator"
-   if Navigator.exists then
-      '///+ close navigator ! ///'
-      Navigator.Close
-      Warnlog "Navigator was open. Check earlier tests. Now closed."
-   else
-      printlog "Navigator: NOT available. Good."
-   endif
-     Printlog "  - insert 3 slides for the individual slide show"
-       SlideShowPresentationSettings				'/// open slide show settings ///'
-       Kontext "Bildschirmpraesentation"
-       Fenster.Check
-       Bildschirmpraesentation.OK
-    InsertSlide                                                           '/// insert slide ///'
+    printlog "new impress document"
+    Call sSelectEmptyLayout
+    printlog "Deactivate Start with current page in ToolsOptions"
+    setStartCurrentPage(FALSE)
+    printlog " check state of navigator ! expected: closed"
+    Kontext "Navigator"
+    if Navigator.exists then
+        printlog " close navigator !"
+        Navigator.Close
+        Warnlog "Navigator was open. Check earlier tests. Now closed."
+    else
+        printlog "Navigator: NOT available. Good."
+    endif
+    Printlog "  - insert 3 slides for the individual slide show"
+    printlog "open slide show settings"
+    SlideShowPresentationSettings
+    Kontext "Bildschirmpraesentation"
+    Fenster.Check
+    Bildschirmpraesentation.OK
+    printlog "insert slide"
+    InsertSlide                                                           
     sleep 2
     Call sSelectEmptyLayout
     hTypekeys "<Pagedown>"
@@ -557,7 +609,8 @@ testcase tExtrasIndividuellePraesentation
     Call sSelectEmptyLayout
     hTypekeys "<Pagedown>"
     sleep 2
-    InsertSlide								'/// insert another slide ///'
+    printlog "insert another slide"
+    InsertSlide								
     sleep 2
     Call sSelectEmptyLayout
     hTypekeys "<Pagedown>"
@@ -565,543 +618,575 @@ testcase tExtrasIndividuellePraesentation
     Printlog "  - Slides added"
     sleep 1
     Kontext "DocumentImpress"
-    DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"		'/// open navigator ///'
+    printlog "open navigator"
+    DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"		
     sleep 1
     Kontext "NavigatorDraw"
    if NavigatorDraw.Exists Then
-      Printlog "  - Navigator exists"
-      Erste.Click							'/// switch to 1st slide ///'
-      Kontext "DocumentImpress"
-      DocumentImpress.MouseDown ( 50, 50 )  '/// Make a click onto the slide to focus onto that ///'
-      DocumentImpress.MouseUp ( 50, 50 )
-      hRechteckErstellen (10,10,20,20)		'/// create rectangle ///'
-      Kontext "NavigatorDraw"
-      Naechste.Click						'/// switch to 2nd slide ///'
-      Kontext "DocumentImpress"
-      hRechteckErstellen (30,30,40,40)		'/// create another rectangle ///'
-      Kontext "NavigatorDraw"
-      Naechste.Click						'/// switch to 3rd slide ///'
-      Kontext "DocumentImpress"
-      hRechteckErstellen (40,40,50,50)		'/// create rectangle ///'
-      Kontext "NavigatorDraw"
-      Naechste.Click						'/// switch to next slide ///'
-      Kontext "DocumentImpress"
-      hRechteckErstellen (50,50,60,60)		'/// create rectangle ///'
-      Printlog "  - Created rectangles on all slides"
-   else
-      Warnlog "  No Navigator"
-   end if
-  sleep 1
-  SlideShowCustomSlideshow					'/// open custom slideshow ///'
-  Kontext "IndividuellePraesentation"
-   Printlog "  - Create new slideshow"
-  Neu.Click								    '/// create new individual slideshow ///'
-  Kontext "IndividuellePraesentationDefinieren"
-  PraesentationName.SetText "Test 1"		'/// set name of individiual slideshow to Test 1 ///'
-  Dim i
-  Dim Zaehler
-  Zaehler=SeitenPraesentation.GetItemCount	'/// add slides to presentation ///'
-     For i=1 to Zaehler
-         SeitenPraesentation.SetNoSelection
-         SeitenPraesentation.Select i
-         Hinzufuegen.Click
-          if SelectedSlides.GetItemCount=i Then
-             Printlog "  - slide added to slideshow"
-          else
-             Warnlog "  Count does not match selection.  Should be: "+ i + " but is: "+ IndividuellePraesentation.GetItemCount
-          end if
-      next i
-         Printlog "  - Add slides using multiple selections"
-      SeitenPraesentation.Select 1
-      Hinzufuegen.Click
-      SeitenPraesentation.Select 2
-      Hinzufuegen.Click
-      SeitenPraesentation.Select 3
-      Hinzufuegen.Click
-      SeitenPraesentation.Select 4
-      Hinzufuegen.Click
-
-         if SelectedSlides.GetItemCount=8 Then			'/// control number of added slides ///'
-            Printlog "  - slides has been added, multiple selection is working"
-         else
-            Warnlog "  Multiple selection does not work"
-         end if
-
-      IndividuellePraesentationDefinieren.OK
-      sleep 2
-  Kontext "IndividuellePraesentation"
-     if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
-     sleep 2
-     Starten.Click									     '/// run presentation ///'
-     Printlog "  - Individual slideshow started"
-     sleep 5
-  Kontext "Navigator"                               '/// Check if the navigator exists, if so - close it ///'
-   if Navigator.Exists Then
-      Printlog "  - Navigator exists, we close it"
-      Navigator.Close								'/// close navigator ///'
-      sleep 2
-   end if
-  Kontext "DocumentPresentation"
-  sleep 3
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<RETURN>"
-  sleep 2
-  DocumentPresentation.TypeKeys "<ESCAPE>"
-  sleep 5
+        Printlog "  - Navigator exists"
+        printlog "switch to 1st slide"
+        Erste.Click							
+        Kontext "DocumentImpress"
+        printlog "Make a click onto the slide to focus onto that"
+        DocumentImpress.MouseDown ( 50, 50 )  
+        DocumentImpress.MouseUp ( 50, 50 )
+        printlog "create rectangle"
+        hRechteckErstellen (10,10,20,20)		
+        Kontext "NavigatorDraw"
+        printlog "switch to 2nd slide"
+        Naechste.Click						
+        Kontext "DocumentImpress"
+        printlog "create another rectangle"
+        hRechteckErstellen (30,30,40,40)		
+        Kontext "NavigatorDraw"
+        printlog "switch to 3rd slide"
+        Naechste.Click						
+        Kontext "DocumentImpress"
+        printlog "create rectangle"
+        hRechteckErstellen (40,40,50,50)		
+        Kontext "NavigatorDraw"
+        printlog "switch to next slide"
+        Naechste.Click						
+        Kontext "DocumentImpress"
+        printlog "create rectangle"
+        hRechteckErstellen (50,50,60,60)		
+        Printlog "  - Created rectangles on all slides"
+    else
+        Warnlog "  No Navigator"
+    end if
+    sleep 1
+    printlog "open custom slideshow"
+    SlideShowCustomSlideshow					
+    Kontext "IndividuellePraesentation"
+    printlog "create new individual slideshow"
+    Neu.Click								    
+    Kontext "IndividuellePraesentationDefinieren"
+    printlog "set name of individiual slideshow to Test 1"
+    PraesentationName.SetText "Test 1"		
+    Dim i
+    Dim Zaehler
+    printlog "add slides to presentation"
+    Zaehler=SeitenPraesentation.GetItemCount	
+    For i=1 to Zaehler
+        SeitenPraesentation.SetNoSelection
+        SeitenPraesentation.Select i
+        Hinzufuegen.Click
+        if SelectedSlides.GetItemCount=i Then
+            Printlog "  - slide added to slideshow"
+        else
+            Warnlog "  Count does not match selection.  Should be: "+ i + " but is: "+ IndividuellePraesentation.GetItemCount
+        end if
+    next i
+    Printlog "  - Add slides using multiple selections"
+    SeitenPraesentation.Select 1
+    Hinzufuegen.Click
+    SeitenPraesentation.Select 2
+    Hinzufuegen.Click
+    SeitenPraesentation.Select 3
+    Hinzufuegen.Click
+    SeitenPraesentation.Select 4
+    Hinzufuegen.Click
+
+    printlog "control number of added slides"
+    if SelectedSlides.GetItemCount=8 Then			
+        Printlog "  - slides has been added, multiple selection is working"
+    else
+        Warnlog "  Multiple selection does not work"
+    end if
+
+    IndividuellePraesentationDefinieren.OK
+    sleep 2
   Kontext "IndividuellePraesentation"
-  if IndividuellePraesentation.IsVisible=False Then
-     Warnlog "  Slideshow should have ended"
-     Kontext "DocumentPresentation"
-     DocumentPresentation.TypeKeys "<ESCAPE>"
-  else
-     printlog "   Presentation seems to have ended successfully"
-  end if
+    if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
+    sleep 2
+    printlog "run presentation"
+    Starten.Click									     
+    Printlog "  - Individual slideshow started"
+    sleep 5
+    printlog "Check if the navigator exists, if so - close it"
+    Kontext "Navigator"                               
+    if Navigator.Exists Then
+        Printlog "  - Navigator exists, we close it"
+        printlog "close navigator"
+        Navigator.Close								
+        sleep 2
+    end if
+    Kontext "DocumentPresentation"
+    sleep 3
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<RETURN>"
+    sleep 2
+    DocumentPresentation.TypeKeys "<ESCAPE>"
+    sleep 5
+    Kontext "IndividuellePraesentation"
+    if IndividuellePraesentation.IsVisible=False Then
+        Warnlog "  Slideshow should have ended"
+        Kontext "DocumentPresentation"
+        DocumentPresentation.TypeKeys "<ESCAPE>"
+    else
+        printlog "   Presentation seems to have ended successfully"
+    end if
 
-  sleep 2
+    sleep 2
 
-  Kontext "IndividuellePraesentation"
-  IndividuellePraesentation.Close                                '/// Close custom slideshow ///'
-
-  Kontext "NavigatorDraw"                                           '/// Navigator: Control if right slide is displayed ///'
-  printlog "  Now we switch to the navigator again"
-  if Liste.GetSelIndex <> 4 then          '/// Unless -Start on first slide- is activated? Default = No ///'
-     Warnlog "  This is not the right slide, it should be 4 but is: " + Liste.GetSelIndex
-  else
-     Printlog "  - Individual slideshow seems to work"
-  end if
-   SlideShowCustomSlideshow                                '/// open custom slideshow ///'
-   '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
-   Kontext "IndividuellePraesentation"
-  if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
-  IndividuellePraesentation.Close
-  sleep 2
-  Kontext "Navigator" 'Draw
-   if Navigator.exists then
-       Navigator.Close   '/// Close the Navigator ///'
-       Kontext "NavigatorDraw"
-       if NavigatorDraw.exists then
-           NavigatorDraw.Close
-       endif
-   else
-      printlog "Navigator: NOT available. Good."
-   endif
-   Kontext "DocumentImpress"
-   setStartCurrentPage(TRUE)
- Call hCloseDocument       '/// close document ///'
-endcase
-
-'****************************************************************************************************
+    Kontext "IndividuellePraesentation"
+    printlog "Close custom slideshow"
+    IndividuellePraesentation.Close                                
+
+    printlog "Navigator: Control if right slide is displayed"
+    Kontext "NavigatorDraw"                                           
+    printlog "  Now we switch to the navigator again"
+    printlog "Unless -Start on first slide- is activated? Default = No"
+    if Liste.GetSelIndex <> 4 then          
+        Warnlog "  This is not the right slide, it should be 4 but is: " + Liste.GetSelIndex
+    else
+        Printlog "  - Individual slideshow seems to work"
+    end if
+    printlog "open custom slideshow"
+    SlideShowCustomSlideshow                                
+    printlog "Set Start with current page back to default = on, in ToolsOptions"
+    Kontext "IndividuellePraesentation"
+    if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
+    IndividuellePraesentation.Close
+    sleep 2
+    Kontext "Navigator" 'Draw
+    if Navigator.exists then
+        printlog "Close the Navigator"
+        Navigator.Close   
+        Kontext "NavigatorDraw"
+        if NavigatorDraw.exists then
+        NavigatorDraw.Close
+        endif
+    else
+        printlog "Navigator: NOT available. Good."
+    endif
+    Kontext "DocumentImpress"
+    setStartCurrentPage(TRUE)
+    printlog "close document"
+    Call hCloseDocument       
+endcase 'tExtrasIndividuellePraesentation
+
+'-------------------------------------------------------------------------------
 
 testcase tSlideshowContextMenuOneSlide
+
     qaerrorlog "Test not yet ready."
-     goto endsub
-   dim NumberOfEntries as Integer
-   Printlog "- ContextMenu in Slideshow"
-   '/// New Impress Document ///'
-   Call hNewDocument
-
-      '/// Start the Slideshow. ///'
-      hTypeKeys "<F5>"
-      '/// Check that the right mousebutton brings up the Context-Menu. ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      '/// Check that the right-click brought up a Context-Menu. ///'
-      '/// And check the number of Menu-Positions (there should be XXX of them ) ///'
-      NumberOfEntries = 0
-      sleep 2
-      try
-         NumberOfEntries = MenuGetItemCount
-      catch
-         warnlog "   No ContextMenu found? Please inform the Automatic Tester"
-         kontext "DocumentImpress"
-         hOpenContextMenu
-         NumberOfEntries = MenuGetItemCount
-      endcatch
-      if (NumberOfEntries = 0) then
-         Warnlog "   the Context-Menu doesnt contain any entries, or were not up. Test ends."
-         Goto Endsub
-      endif
-      if NumberOfEntries <> 3 then
-         warnlog "   Expected three entries in this Menu, but found " + NumberOfEntries
-'      if NumberOfEntries <> 6 then
-'         warnlog "   Expected six entries in this Menu, but found " + NumberOfEntries
-      else
-         printlog "   Number of Entries was: " + NumberOfEntries
-      endif
-      '/// Check that every position contains the expected Undermenu. ("Screen": Black/White. and "End Slideshow") ///'
-      '/// And check that Menu-Item one opens an undermenu. ///'
-      Printlog "   We open number one: " + MenuGetItemText(MenuGetItemID(1))
-      hMenuSelectNr (1)
-      sleep 2
-      NumberOfEntries = MenuGetItemCount
-      printlog "   Menu-entries: " + MenuGetItemCount
-      if (NumberOfEntries <> 2) then
-         Warnlog "   the third Context-Menu-entry was NOT 'Screen'."
-      else
-         Printlog "   We open the next number one: " + MenuGetItemText(MenuGetItemID(1))
-         hMenuSelectNr (1)
-      endif
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      hMenuSelectNr (1) 'Open the Screen -menu.
-      sleep 2
-      Printlog "   We open number two: " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
-      hMenuSelectNr (2) 'Choose "White"
-      sleep 2
-
-      'TODO - Due to existing bug, function not yet available.
-      '/// Change to slideshow-ending. Check that the Context-Menu also comes up here. ///'
-      'DocumentPresentation.
-      hTypeKeys "<SPACE>"
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-      NumberOfEntries = 0
-      NumberOfEntries = MenuGetItemCount
-      if NumberOfEntries <> 0 then
-         printlog "   Menu-entries: " + MenuGetItemCount
-      else
-         warnlog "   No context-menu at Slideshow-endpage."
-         DocumentPresentation.TypeKeys "<ESCAPE>"
-      endif
-
-      '/// And that one can go back. ///'
-      hMenuSelectNr (1) 'Open the Goto Slide -menu.
-      sleep 2
-      Printlog "   We open number one (should be 'Goto First Slide'): " + MenuGetItemText(MenuGetItemID(1))
-      hMenuSelectNr (2) 'Choose "Back" 'TODO ;: but now we just end the slideshow
-      sleep 2
-
-      Kontext "DocumentPresentation"
-      DocumentPresentation.TypeKeys "<ESCAPE>"
-      DocumentPresentation.TypeKeys "<ESCAPE>"
-      Kontext "DocumentImpress"
-      InsertSlide
-
-      '/// Start the Slideshow. ///'
-      hTypeKeys "<F5>"
-      '/// Check that the right mousebutton brings up the Context-Menu. ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      '/// Check that Menu-Item (three) really finishes the presentation. ///'
-      Printlog "   We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
-      hMenuSelectNr (4) 'MenuGetItemCount) 'End Slideshow
-      if DocumentPresentation.Exists then
-         Warnlog "either wrong position for 'End Slideshow', or the command didnt work."
-      else
-         printlog "The presentation was closed, good."
-      endif
-
-      '/// Check that one can step one step forward, even if there is no more than one slide. ///'
-      '/// Start the Slideshow. ///'
-      hTypeKeys "<F5>"
-      '/// Check that the right mousebutton brings up the Context-Menu. ///'
-      sleep (2)
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-
-      '/// Select the 'one step forward' -entry ///'
-      hMenuSelectNr (1)
-
-      '/// Check that we're on the last slide ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-      if MenuIsItemEnabled (MenugetItemID(4)) then
-         printlog "Jumped to the right slide"
-      else
-         warnlog "possibly the 'jump to slide' -menu didnt quite work"
-      endif
-
-      '/// Close the Context-Menu ///'
-      hMenuSelectNr (0)
-      Kontext "DocumentPresentation"
-
-      '/// Check if the context-menu also comes up at the very last page (slideshow-ending) ///'
-      DocumentPresentation.TypeKeys "<SPACE>"
-'      DocumentPresentation.TypeKeys "<SPACE>"
-      sleep 1
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      if MenuGetItemText (MenuGetItemID(1)) <> "" then
-         Printlog "Context-menu came up at the last page: correct."
-      else
-         Warnlog "Context-menu did NOT come up correctly at the last page: false."
-      endif
-
-      '/// Check if we from here, via the context menu, can go back to the first page ///'
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-      sleep 1
-      hMenuSelectNr (1) 'First Slide
-
-      '/// Check that we're on the first slide ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-      if MenuIsItemEnabled (MenugetItemID(3)) then
-         printlog "Jumped to the right slide"
-      else
-         warnlog "possibly the 'jump to slide' -menu didnt quite work from the last slide"
-      endif
-
-      '/// Close the Context-Menu ///'
-      MenuSelect (0)
-      '/// Close the Presentation ///'
-      hTypeKeys "<ESCAPE>"
-   '/// Close Document ///'
-   Call hCloseDocument
+    goto endsub
+
+    dim NumberOfEntries as Integer
+
+    Printlog "- ContextMenu in Slideshow"
+    printlog "New Impress Document"
+    Call hNewDocument
+
+    printlog "Start the Slideshow."
+    hTypeKeys "<F5>"
+    printlog "Check that the right mousebutton brings up the Context-Menu."
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    printlog "Check that the right-click brought up a Context-Menu."
+    printlog "And check the number of Menu-Positions (there should be XXX of them )"
+    NumberOfEntries = 0
+    sleep 2
+    try
+        NumberOfEntries = MenuGetItemCount
+    catch
+        warnlog "   No ContextMenu found? Please inform the Automatic Tester"
+        kontext "DocumentImpress"
+        hOpenContextMenu
+        NumberOfEntries = MenuGetItemCount
+    endcatch
+    if (NumberOfEntries = 0) then
+        Warnlog "   the Context-Menu doesnt contain any entries, or were not up. Test ends."
+        Goto Endsub
+    endif
+    if NumberOfEntries <> 3 then
+        warnlog "   Expected three entries in this Menu, but found " + NumberOfEntries
+        '      if NumberOfEntries <> 6 then
+        '         warnlog "   Expected six entries in this Menu, but found " + NumberOfEntries
+    else
+        printlog "   Number of Entries was: " + NumberOfEntries
+    endif
+    printlog "Check that every position contains the expected Undermenu. (Screen: Black/White. and End Slideshow)"
+    printlog "And check that Menu-Item one opens an undermenu."
+    Printlog "   We open number one: " + MenuGetItemText(MenuGetItemID(1))
+    hMenuSelectNr (1)
+    sleep 2
+    NumberOfEntries = MenuGetItemCount
+    printlog "   Menu-entries: " + MenuGetItemCount
+    if (NumberOfEntries <> 2) then
+        Warnlog "   the third Context-Menu-entry was NOT 'Screen'."
+    else
+        Printlog "   We open the next number one: " + MenuGetItemText(MenuGetItemID(1))
+        hMenuSelectNr (1)
+    endif
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    printlog "Open the Screen -menu."
+    hMenuSelectNr (1)
+    sleep 2
+    Printlog "   We open number two: " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
+    printlog "Choose White"
+    hMenuSelectNr (2)
+    sleep 2
+
+    'TODO - Due to existing bug, function not yet available.
+    printlog "Change to slideshow-ending. Check that the Context-Menu also comes up here."
+    'DocumentPresentation.
+    hTypeKeys "<SPACE>"
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+    NumberOfEntries = 0
+    NumberOfEntries = MenuGetItemCount
+    if NumberOfEntries <> 0 then
+        printlog "   Menu-entries: " + MenuGetItemCount
+    else
+        warnlog "   No context-menu at Slideshow-endpage."
+        DocumentPresentation.TypeKeys "<ESCAPE>"
+    endif
+
+    printlog "And that one can go back."
+    hMenuSelectNr (1) 'Open the Goto Slide -menu.
+    sleep 2
+    Printlog "   We open number one (should be 'Goto First Slide'): " + MenuGetItemText(MenuGetItemID(1))
+    hMenuSelectNr (2) 'Choose "Back" 'TODO ;: but now we just end the slideshow
+    sleep 2
+
+    Kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<ESCAPE>"
+    DocumentPresentation.TypeKeys "<ESCAPE>"
+    Kontext "DocumentImpress"
+    InsertSlide
+
+    printlog "Start the Slideshow."
+    hTypeKeys "<F5>"
+    printlog "Check that the right mousebutton brings up the Context-Menu."
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    printlog "Check that Menu-Item (three) really finishes the presentation."
+    Printlog "   We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
+    hMenuSelectNr (4) 'MenuGetItemCount) 'End Slideshow
+    if DocumentPresentation.Exists then
+        Warnlog "either wrong position for 'End Slideshow', or the command didnt work."
+    else
+        printlog "The presentation was closed, good."
+    endif
+
+    printlog "Check that one can step one step forward, even if there is no more than one slide."
+    printlog "Start the Slideshow."
+    hTypeKeys "<F5>"
+    printlog "Check that the right mousebutton brings up the Context-Menu."
+    sleep (2)
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    printlog "Open the Goto Slide -menu"
+    hMenuSelectNr (2)
+    printlog "Select the 'one step forward' -entry"
+    hMenuSelectNr (1)
+
+    printlog "Check that we're on the last slide"
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    hMenuSelectNr (2) 
+    if MenuIsItemEnabled (MenugetItemID(4)) then
+        printlog "Jumped to the right slide"
+    else
+        warnlog "possibly the 'jump to slide' -menu didnt quite work"
+    endif
+
+    printlog "Close the Context-Menu"
+    hMenuSelectNr (0)
+    Kontext "DocumentPresentation"
+
+    printlog "Check if the context-menu also comes up at the very last page (slideshow-ending)"
+    DocumentPresentation.TypeKeys "<SPACE>"
+    sleep 1
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    if MenuGetItemText (MenuGetItemID(1)) <> "" then
+        Printlog "Context-menu came up at the last page: correct."
+    else
+        Warnlog "Context-menu did NOT come up correctly at the last page: false."
+    endif
+
+    printlog "Check if we from here, via the context menu, can go back to the first page"
+    hMenuSelectNr (2) 'Open the Goto Slide -menu.
+    sleep 1
+    hMenuSelectNr (1) 'First Slide
+
+    printlog "Check that we're on the first slide"
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    hMenuSelectNr (2) 'Open the Goto Slide -menu.
+    if MenuIsItemEnabled (MenugetItemID(3)) then
+        printlog "Jumped to the right slide"
+    else
+        warnlog "possibly the 'jump to slide' -menu didnt quite work from the last slide"
+    endif
+
+    printlog "Close the Context-Menu"
+    MenuSelect (0)
+    printlog "Close the Presentation"
+    hTypeKeys "<ESCAPE>"
+    printlog "Close Document"
+    Call hCloseDocument
 endcase 'tSlideshowContextMenuOneSlide
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSlideshowContextMenuMoreSlides
+
     qaerrorlog "Test not yet ready."
-     goto endsub
-   dim NumberOfEntries as Integer
-   Printlog "- ContextMenu in Slideshow"
-   '/// New Impress Document ///'
-   Call hNewDocument
-      '/// Insert three new Slides ///'
-      InsertSlide
-      InsertSlide
-      InsertSlide
-      '/// Start the Slideshow. ///'
-      hTypeKeys "<F5>"
-      sleep (3)
-      '/// Check that the right mousebutton brings up the Context-Menu. ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      '/// Check that the right-click brought up a Context-Menu. ///'
-      '/// And check the number of Menu-Positions (there should be XXX of them ) ///'
-      NumberOfEntries = 0
-      sleep 2
-      try
-         NumberOfEntries = MenuGetItemCount
-      catch
-         warnlog "   No ContextMenu found? Please inform the Automatic Tester"
-         kontext "DocumentImpress"
-         hOpenContextMenu
-         NumberOfEntries = MenuGetItemCount
-      endcatch
-      if (NumberOfEntries = 0) then
-         Warnlog "   the Context-Menu doesnt contain any entries, or were not up. Test ends."
-         Goto Endsub
-      endif
-      if NumberOfEntries <> 6 then
-         warnlog "   Expected six entries in this Menu, but found " + NumberOfEntries
-      else
-         printlog "   Number of Entries was: " + NumberOfEntries
-      endif
-      '/// Check that every position contains the expected Undermenu. ("Screen": Black/White. and "End Slideshow") ///'
-      '/// And check that Menu-Item one opens an undermenu. ///'
-      Printlog "   We open number four: " + MenuGetItemText(MenuGetItemID(4))
-      hMenuSelectNr (3)
-      sleep 2
-      NumberOfEntries = MenuGetItemCount
-      printlog "   Menu-entries: " + MenuGetItemCount
-      if (NumberOfEntries <> 2) then
-         Warnlog "   the first Context-Menu-entry was NOT 'Screen'."
-      else
-         Printlog "   We open the next number one: " + MenuGetItemText(MenuGetItemID(1))
-         hMenuSelectNr (1)
-      endif
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      hMenuSelectNr (3) 'Open the Screen -menu.
-      sleep 2
-      Printlog "   We open number two: " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
-      hMenuSelectNr (2) 'Choose "White"
-      sleep 2
-
-      'TODO - Due to existing bug, function not yet available.
-      '/// Change to slideshow-ending. Check that the Context-Menu also comes up here. ///'
-      'DocumentPresentation.
-      hTypeKeys "<SPACE>"
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-      NumberOfEntries = 0
-      NumberOfEntries = MenuGetItemCount
-      if NumberOfEntries <> 0 then
-         printlog "   Menu-entries: " + MenuGetItemCount
-      else
-         warnlog "   No context-menu at Slideshow-endpage."
-         DocumentPresentation.TypeKeys "<ESCAPE>"
-      endif
-
-      '/// And that one can go back. ///'
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-      sleep 2
-      Printlog "   We open number one (should be 'Goto First Slide'): " + MenuGetItemText(MenuGetItemID(1))
-      hMenuSelectNr (2) 'Choose "Back" 'TODO ;: but now we just end the slideshow
-      sleep 2
-
-      Kontext "DocumentPresentation"
-      DocumentPresentation.TypeKeys "<ESCAPE>"
-      DocumentPresentation.TypeKeys "<ESCAPE>"
-      Kontext "DocumentImpress"
-
-      '/// Start the Slideshow. ///'
-      hTypeKeys "<F5>"
-      '/// Check that the right mousebutton brings up the Context-Menu. ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      '/// Check that Menu-Item (three) really finishes the presentation. ///'
-      Printlog "   We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
-      hMenuSelectNr (4)'MenuGetItemCount) 'End Slideshow
-      sleep 4
-      if DocumentPresentation.Exists then
-         Warnlog "either wrong position for 'End Slideshow', or the command didnt work."
-         Kontext "DocumentPresentation"
-         DocumentPresentation.MouseDown 50, 50, 3
-         DocumentPresentation.MouseUp 50, 50, 3
-         sleep 2
-         Printlog "   We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
-         hMenuSelectNr (4)'MenuGetItemCount) 'End Slideshow
-      else
-         printlog "The presentation was closed, good."
-      endif
-
-      '/// Check that one can step one step forward, even if there is no more than one slide. ///'
-      '/// Start the Slideshow. ///'
-      hTypeKeys "<F5>"
-      sleep (3)
-      '/// Check that the right mousebutton brings up the Context-Menu. ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-
-      '/// Select the 'one step forward' -entry ///'
-      hMenuSelectNr (1)
-
-      '/// Check that we're on the last slide ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-      if MenuIsItemEnabled (MenugetItemID(4)) then
-         printlog "Jumped to the right slide"
-      else
-         warnlog "possibly the 'jump to slide' -menu didnt quite work"
-      endif
-
-      '/// Close the Context-Menu ///'
-      hMenuSelectNr (0)
-      Kontext "DocumentPresentation"
-
-      '/// Check if the context-menu also comes up at the very last page (slideshow-ending) ///'
-      DocumentPresentation.TypeKeys "<SPACE>"
-      sleep 1
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      if MenuGetItemText (MenuGetItemID(1)) <> "" then
-         Printlog "Context-menu came up at the last page: correct."
-      else
-         Warnlog "Context-menu did NOT come up correctly at the last page: false."
-      endif
-
-      '/// Check if we from here, via the context menu, can go back to the first page ///'
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-      sleep 1
-      hMenuSelectNr (1) 'First Slide
-
-      '/// Check that we're on the first slide ///'
-      Kontext "DocumentPresentation"
-      DocumentPresentation.MouseDown 50, 50, 3
-      DocumentPresentation.MouseUp 50, 50, 3
-      sleep 2
-
-      hMenuSelectNr (2) 'Open the Goto Slide -menu.
-      if MenuIsItemEnabled (MenugetItemID(3)) then
-         printlog "Jumped to the right slide"
-      else
-         warnlog "possibly the 'jump to slide' -menu didnt quite work from the last slide"
-      endif
-
-      '/// Close the Context-Menu ///'
-      MenuSelect (0)
-      '/// Close the Presentation ///'
-      hTypeKeys "<ESCAPE>"
-   '/// Close Document ///'
-   Call hCloseDocument
+    goto endsub
+
+    dim NumberOfEntries as Integer
+
+    Printlog "- ContextMenu in Slideshow"
+    printlog "New Impress Document"
+    Call hNewDocument
+    printlog "Insert three new Slides"
+    InsertSlide
+    InsertSlide
+    InsertSlide
+    printlog "Start the Slideshow."
+    hTypeKeys "<F5>"
+    sleep (3)
+    printlog "Check that the right mousebutton brings up the Context-Menu."
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    printlog "Check that the right-click brought up a Context-Menu."
+    printlog "And check the number of Menu-Positions (there should be XXX of them )"
+    NumberOfEntries = 0
+    sleep 2
+    try
+        NumberOfEntries = MenuGetItemCount
+    catch
+        warnlog "   No ContextMenu found? Please inform the Automatic Tester"
+        kontext "DocumentImpress"
+        hOpenContextMenu
+        NumberOfEntries = MenuGetItemCount
+    endcatch
+    if (NumberOfEntries = 0) then
+        Warnlog "   the Context-Menu doesnt contain any entries, or were not up. Test ends."
+        Goto Endsub
+    endif
+    if NumberOfEntries <> 6 then
+        warnlog "   Expected six entries in this Menu, but found " + NumberOfEntries
+    else
+        printlog "   Number of Entries was: " + NumberOfEntries
+    endif
+    printlog "Check that every position contains the expected Undermenu. (Screen: Black/White. and End Slideshow)"
+    printlog "And check that Menu-Item one opens an undermenu."
+    Printlog "   We open number four: " + MenuGetItemText(MenuGetItemID(4))
+    hMenuSelectNr (3)
+    sleep 2
+    NumberOfEntries = MenuGetItemCount
+    printlog "   Menu-entries: " + MenuGetItemCount
+    if (NumberOfEntries <> 2) then
+        Warnlog "   the first Context-Menu-entry was NOT 'Screen'."
+    else
+        Printlog "   We open the next number one: " + MenuGetItemText(MenuGetItemID(1))
+        hMenuSelectNr (1)
+    endif
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    hMenuSelectNr (3) 'Open the Screen -menu.
+    sleep 2
+    Printlog "   We open number two: " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
+    hMenuSelectNr (2) 'Choose "White"
+    sleep 2
+
+    'TODO - Due to existing bug, function not yet available.
+    printlog "Change to slideshow-ending. Check that the Context-Menu also comes up here."
+    'DocumentPresentation.
+    hTypeKeys "<SPACE>"
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+    NumberOfEntries = 0
+    NumberOfEntries = MenuGetItemCount
+    if NumberOfEntries <> 0 then
+        printlog "   Menu-entries: " + MenuGetItemCount
+    else
+        warnlog "   No context-menu at Slideshow-endpage."
+        DocumentPresentation.TypeKeys "<ESCAPE>"
+    endif
+
+    printlog "And that one can go back."
+    hMenuSelectNr (2) 'Open the Goto Slide -menu.
+    sleep 2
+    Printlog "   We open number one (should be 'Goto First Slide'): " + MenuGetItemText(MenuGetItemID(1))
+    hMenuSelectNr (2) 'Choose "Back" 'TODO ;: but now we just end the slideshow
+    sleep 2
+
+    Kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<ESCAPE>"
+    DocumentPresentation.TypeKeys "<ESCAPE>"
+    Kontext "DocumentImpress"
+
+    printlog "Start the Slideshow."
+    hTypeKeys "<F5>"
+    printlog "Check that the right mousebutton brings up the Context-Menu."
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    printlog "Check that Menu-Item (three) really finishes the presentation."
+    Printlog "   We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
+    hMenuSelectNr (4)'MenuGetItemCount) 'End Slideshow
+    sleep 4
+    if DocumentPresentation.Exists then
+        Warnlog "either wrong position for 'End Slideshow', or the command didnt work."
+        Kontext "DocumentPresentation"
+        DocumentPresentation.MouseDown 50, 50, 3
+        DocumentPresentation.MouseUp 50, 50, 3
+        sleep 2
+        Printlog "   We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
+        hMenuSelectNr (4)'MenuGetItemCount) 'End Slideshow
+    else
+        printlog "The presentation was closed, good."
+    endif
+
+    printlog "Check that one can step one step forward, even if there is no more than one slide."
+    printlog "Start the Slideshow."
+    hTypeKeys "<F5>"
+    sleep (3)
+    printlog "Check that the right mousebutton brings up the Context-Menu."
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    hMenuSelectNr (2) 'Open the Goto Slide -menu.
+
+    printlog "Select the 'one step forward' -entry"
+    hMenuSelectNr (1)
+
+    printlog "Check that we're on the last slide"
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    hMenuSelectNr (2) 'Open the Goto Slide -menu.
+    if MenuIsItemEnabled (MenugetItemID(4)) then
+        printlog "Jumped to the right slide"
+    else
+        warnlog "possibly the 'jump to slide' -menu didnt quite work"
+    endif
+
+    printlog "Close the Context-Menu"
+    hMenuSelectNr (0)
+    Kontext "DocumentPresentation"
+
+    printlog "Check if the context-menu also comes up at the very last page (slideshow-ending)"
+    DocumentPresentation.TypeKeys "<SPACE>"
+    sleep 1
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    if MenuGetItemText (MenuGetItemID(1)) <> "" then
+        Printlog "Context-menu came up at the last page: correct."
+    else
+        Warnlog "Context-menu did NOT come up correctly at the last page: false."
+    endif
+
+    printlog "Check if we from here, via the context menu, can go back to the first page"
+    hMenuSelectNr (2) 'Open the Goto Slide -menu.
+    sleep 1
+    hMenuSelectNr (1) 'First Slide
+
+    printlog "Check that we're on the first slide"
+    Kontext "DocumentPresentation"
+    DocumentPresentation.MouseDown 50, 50, 3
+    DocumentPresentation.MouseUp 50, 50, 3
+    sleep 2
+
+    hMenuSelectNr (2) 'Open the Goto Slide -menu.
+    if MenuIsItemEnabled (MenugetItemID(3)) then
+        printlog "Jumped to the right slide"
+    else
+        warnlog "possibly the 'jump to slide' -menu didnt quite work from the last slide"
+    endif
+
+    printlog "Close the Context-Menu"
+    MenuSelect (0)
+    printlog "Close the Presentation"
+    hTypeKeys "<ESCAPE>"
+    printlog "Close Document"
+    Call hCloseDocument
 endcase 'tSlideshowContextMenuMoreSlides
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tiMousePointerHides
+
     qaerrorlog "Test not yet ready."
-     goto endsub
-   dim i as Integer
-   Printlog "- ContextMenu in Slideshow"
-   '/// New Impress Document ///'
-   Call hNewDocument
-
-      '/// Start the Slideshow. ///'
-      hTypeKeys "<F5>"
-      sleep 1
-      i = 0
-      while ((getMouseStyle = 0) AND (i<20))
-          sleep 1
-          inc (i)
-          printlog getMouseStyle
-          if (getMouseStyle <> 0) then i = 20
-      wend
-      if (getMouseStyle <> 0) then
-         printlog "Mousepointer disappeared like it should have"
-      else
-         warnlog "the mousepointer was still visible, after 20 seconds."
-      endif
-
-      hTypeKeys "<ESCAPE>"
-      hTypeKeys "<ESCAPE>"
-
-   '/// Close Document ///'
-   Call hCloseDocument
-endcase 'tSlideshowContextMenuMoreSlides
+    goto endsub
 
-'****************************************************************************************************
+    dim i as Integer
 
+    Printlog "- ContextMenu in Slideshow"
+    printlog "New Impress Document"
+    Call hNewDocument
+
+    printlog "Start the Slideshow."
+    hTypeKeys "<F5>"
+    sleep 1
+    i = 0
+    while ((getMouseStyle = 0) AND (i<20))
+    sleep 1
+    inc (i)
+    printlog getMouseStyle
+    if (getMouseStyle <> 0) then i = 20
+    wend
+    if (getMouseStyle <> 0) then
+        printlog "Mousepointer disappeared like it should have"
+    else
+        warnlog "the mousepointer was still visible, after 20 seconds."
+    endif
+
+    hTypeKeys "<ESCAPE>"
+    hTypeKeys "<ESCAPE>"
+
+    printlog "Close Document"
+    Call hCloseDocument
+endcase 'tiMousePointerHides
+
+'-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
index ea8efd09dd2c..38c25d41bde5 100644
--- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
@@ -358,10 +358,10 @@ endcase
 
 testcase tFileRecentDocuments
 
-'if gPlatform = "lin" then
-'    warnlog "#110649# Due to bug this testcase is not available"
-'    goto endsub
-'end if
+if gPlatform = "lin" then
+    warnlog "#110649# Due to bug this testcase is not available"
+    goto endsub
+end if
     
     dim sTestFile as string