CWS-TOOLING: integrate CWS automationdev300m89graphics

49 files changed, 5067 insertions, 5385 deletions

diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas
index b5968240e024..45b5ef107409 100755
--- a/testautomation/graphics/optional/d_export_graphic_a.bas
+++ b/testautomation/graphics/optional/d_export_graphic_a.bas
@@ -51,16 +51,16 @@ sub main
     endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
-    Call tEPS   '///+-   Encapsulated PostScript            ///'
-    Call tPCT   '///+-   Mac Pict                           ///'
-    Call tPBM   '///+-   Portable Bitmap                    ///'
-    Call tPGM   '///+-   Portable Graymap                   ///'
-    Call tPPM   '///+-   Portable Pixelmap                  ///'
-    Call tRAS   '///+-   Sun Raster Image                   ///'
-    Call tTIFF  '///+-   Tagged Image File Format           ///'
-    Call tXPM   '///+-   X PixMap                           ///'
-    Call tGIF   '///+-   Graphics Interchange Format        ///'
-    Call tJPEG  '///+-   Joint Photographic Experts Group   ///'
+    Call tEPS   'Encapsulated PostScript         
+    Call tPCT   'Mac Pict                        
+    Call tPBM   'Portable Bitmap                 
+    Call tPGM   'Portable Graymap                
+    Call tPPM   'Portable Pixelmap               
+    Call tRAS   'Sun Raster Image                
+    Call tTIFF  'Tagged Image File Format
+    Call tXPM   'X PixMap
+    Call tGIF   'Graphics Interchange Format     
+    Call tJPEG  'Joint Photographic Experts Group
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/d_export_graphic_b.bas b/testautomation/graphics/optional/d_export_graphic_b.bas
index 97560705afc4..f1a4d783ef62 100755
--- a/testautomation/graphics/optional/d_export_graphic_b.bas
+++ b/testautomation/graphics/optional/d_export_graphic_b.bas
@@ -50,16 +50,16 @@ sub main
     endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
-    Call tPNG   '///+-   Portable Network Graphic           ///'
-    Call tSVM   '///+-   StarView Metafile                  ///'
-    Call tPDF   '///+-   Portable Document Format           ///'
-    Call tPDF_Creator '///+-   test if the right creator is set in the PDF document
-    Call tSVG   '///+-   Scalable Vector Graphics           ///'
-    Call tBMP   '///+-   Windows Bitmap                     ///'
-    Call tEMF   '///+-   Enhanced Metafile                  ///'
-    Call tMET   '///+-   OS/2 Metafile                      ///'
-    Call tSWF   '///+-   Macromedia Flash (SWF) (.swf)      ///'
-    Call tWMF   '///+-   Windows Metafile                   ///'
+    Call tPNG   'Portable Network Graphic
+    Call tSVM   'StarView Metafile
+    Call tPDF   'Portable Document Format
+    Call tPDF_Creator 'test if the right creator is set in the PDF document
+    Call tSVG   'Scalable Vector Graphics
+    Call tBMP   'Windows Bitmap          
+    Call tEMF   'Enhanced Metafile       
+    Call tMET   'OS/2 Metafile           
+    Call tSWF   'Macromedia Flash (SWF) (.swf)
+    Call tWMF   'Windows Metafile   
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas
index 9dee4114b37f..1bd3149cf650 100755
--- a/testautomation/graphics/optional/export_graphic_a.bas
+++ b/testautomation/graphics/optional/export_graphic_a.bas
@@ -50,16 +50,16 @@ sub main
     endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
-    Call tEPS   '///+-   Encapsulated PostScript            ///'
-    Call tPCT   '///+-   Mac Pict                           ///'
-    Call tPBM   '///+-   Portable Bitmap                    ///'
-    Call tPGM   '///+-   Portable Graymap                   ///'
-    Call tPPM   '///+-   Portable Pixelmap                  ///'
-    Call tRAS   '///+-   Sun Raster Image                   ///'
-    Call tTIFF  '///+-   Tagged Image File Format           ///'
-    Call tXPM   '///+-   X PixMap                           ///'
-    Call tGIF   '///+-   Graphics Interchange Format        ///'
-    Call tJPEG  '///+-   Joint Photographic Experts Group   ///'
+    Call tEPS   'Encapsulated PostScript        
+    Call tPCT   'Mac Pict                       
+    Call tPBM   'Portable Bitmap                
+    Call tPGM   'Portable Graymap               
+    Call tPPM   'Portable Pixelmap              
+    Call tRAS   'Sun Raster Image               
+    Call tTIFF  'Tagged Image File Format       
+    Call tXPM   'X PixMap                       
+    Call tGIF   'Graphics Interchange Format    
+    Call tJPEG  'Joint Photographic Experts Group
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/export_graphic_b.bas b/testautomation/graphics/optional/export_graphic_b.bas
index 9502b5005625..0abe27eb7579 100755
--- a/testautomation/graphics/optional/export_graphic_b.bas
+++ b/testautomation/graphics/optional/export_graphic_b.bas
@@ -50,16 +50,16 @@ sub main
     endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
-    Call tPDF   '///+-   Portable Document Format           ///'
-    Call tPDF_Creator '///+-   test if the right creator is set in the PDF document
-    Call tSVG   '///+-   Scalable Vector Graphics           ///'
-    Call tSVM   '///+-   StarView Metafile                  ///'
-    Call tBMP   '///+-   Windows Bitmap                     ///'
-    Call tEMF   '///+-   Enhanced Metafile                  ///'
-    Call tPNG   '///+-   Portable Network Graphic           ///'
-    Call tMET   '///+-   OS/2 Metafile                      ///'
-    Call tWMF   '///+-   Windows Metafile                   ///'
-    Call tSWF   '///+-   Macromedia Flash (SWF) (.swf)      ///'
+    Call tPDF   ' Portable Document Format  
+    Call tPDF_Creator  'test if the right creator is set in the PDF document
+    Call tSVG   'Scalable Vector Graphics
+    Call tSVM   'StarView Metafile                 
+    Call tBMP   'Windows Bitmap                    
+    Call tEMF   'Enhanced Metafile                 
+    Call tPNG   'Portable Network Graphic          
+    Call tMET   'OS/2 Metafile                     
+    Call tWMF   'Windows Metafile                  
+    Call tSWF   'Macromedia Flash (SWF) (.swf)     
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas
index 8a9062c87c05..e52427f1402a 100755
--- a/testautomation/graphics/optional/i_slideshow.bas
+++ b/testautomation/graphics/optional/i_slideshow.bas
@@ -52,7 +52,7 @@ sub main
         warnlog "Add 'slide' to FILE  /input/impress/locale_1.txt (take string from below)!!!"
     endif
 
-    '/// LOCALE Slide - 2 ///'
+    printlog "LOCALE Slide - 2"
     S1 = glLocale (2) + " 1"
     S2 = glLocale (2) + " 2"
     S3 = glLocale (2) + " 3"
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index 1e9d6e04f631..71986e9b94d7 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -254,171 +254,127 @@ testcase tPDF
     dim iFileSize(12) as long
     dim i as integer
 
-    '/// Export the file 12 times: ///'
-    '///+ every compression level (3) and every range (3), check if button in toolbar uses last settings (6) (-> 12) ///'
+    printlog "Export the file 12 times: "
+    printlog "every compression level (3) and every range (3), check if button in toolbar uses last settings (6) (-> 12) "
     hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport_pdf."+ExtensionString ))
     sleep (10)
 
     '---------------------------------------------------------------------------------------------------------------------------------------------------------
-    '###### all / Screen optimized ######
-    '/// File->Export as PDF document
     printlog "File->Export as PDF document"
-    '///+ range = All
     printlog " range = All"
-    '///+ compression = Screen optimized
     printlog " compression = Screen optimized"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '---------------------------------------------------------   Output the first file ---------------------------------------------------------------
+    printlog "-------------------   Output the first file ---------------------"
 
     hExportAsPDFmulti (3, TRUE, OutputGrafikTBO + 1, TRUE, FALSE, 1, 1)
-    '/// Export using Button in toolbar
     printlog "Export using Button in toolbar"
-    '///+ use the settings from the export before
     printlog " use the settings from the export before"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '-------------------------------------------------------   Output the second file -------------------------------------------------------------
+    printlog "---------------------   Output the second file -------------------"
 
     hExportAsPDFmulti (1, TRUE, OutputGrafikTBO + 2, TRUE, FALSE, 1, 1) ' button in toolbar -> last settings have to be used
 
-    '###### range / Screen optimized ######
-    '/// File->Export as PDF document
+   
     printlog "File->Export as PDF document"
-    '///+ range = Range
     printlog " range = Range"
-    '///+ compression = Screen optimized
     printlog " compression = Screen optimized"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '---------------------------------------------------------  Output the third file  ---------------------------------------------------------------
+    printlog "----------------  Output the third file  --------------------"
 
     hExportAsPDFmulti (3, TRUE, OutputGrafikTBO + 3, TRUE, FALSE, 2, 1, "2")
 
-    '/// Export using Button in toolbar
     printlog "Export using Button in toolbar"
-    '///+ use the settings from the export before
     printlog " use the settings from the export before"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '---------------------------------------------------------  Output the fourth file  -------------------------------------------------------------
+    printlog "----------------------  Output the fourth file  -----------------"
 
     hExportAsPDFmulti (1, TRUE, OutputGrafikTBO + 4, TRUE, FALSE, 2, 1) ' button in toolbar -> last settings have to be used
 
-    '###### all / Print optimized ######
-    '/// File->Export as PDF document
     printlog "File->Export as PDF document"
-    '///+ range = all
     printlog " range = all"
-    '///+ compression = Print optimized
     printlog " compression = Print optimized"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '------------------------------------------------------------  Output the fifth file  --------------------------------------------------------------
+    printlog "-----------------------------  Output the fifth file  ------------"
 
     hExportAsPDFmulti (3, TRUE, OutputGrafikTBO + 5, TRUE, FALSE, 1, 2)
 
-    '/// Export using Button in toolbar
     printlog "Export using Button in toolbar"
-    '///+ use the settings from the export before
     printlog " use the settings from the export before"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '-----------------------------------------------------------  Output the sixth file  ---------------------------------------------------------------
+    printlog "----------------------  Output the sixth file  -------------------"
 
     hExportAsPDFmulti (1, TRUE, OutputGrafikTBO + 6, TRUE, FALSE, 1, 2) ' button in toolbar -> last settings have to be used
 
-    '###### range / Print optimized ######
-    '/// File->Export as PDF document
     printlog "File->Export as PDF document"
-    '///+ range = Range
     printlog " range = Range"
-    '///+ compression = Screen optimized
     printlog " compression = Screen optimized"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '---------------------------------------------------------  Output the seventh file  -------------------------------------------------------------
+    printlog "------------------  Output the seventh file  ---------------------"
 
     hExportAsPDFmulti (3, TRUE, OutputGrafikTBO + 7, TRUE, FALSE, 2, 2, "2")
 
-    '/// Export using Button in toolbar
     printlog "Export using Button in toolbar"
-'    '///+ use the settings from the export before
     printlog " use the settings from the export before"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '------------------------------------------------------------  Output the eight file  ----------------------------------------------------------------
+    printlog "----------------------  Output the eight file  -------------------"
 
     hExportAsPDFmulti (1, TRUE, OutputGrafikTBO + 8, TRUE, FALSE, 2, 2) ' button in toolbar -> last settings have to be used
 
-    '###### all / Press optimized ######
-    '/// File->Export as PDF document ///'
-    printlog "File->Export as PDF document ///'"
-    '///+ range = all
+    printlog "File->Export as PDF document"
     printlog " range = all"
-    '///+ compression = Press optimized
     printlog " compression = Press optimized"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '------------------------------------------------------------  Output the ninth file  ----------------------------------------------------------------
+    printlog "-------------------  Output the ninth file  ----------------------"
 
     hExportAsPDFmulti (3, TRUE, OutputGrafikTBO + 9, TRUE, FALSE, 1, 3)
-    '/// Export using Button in toolbar
-    '///+ use the settings from the export before
-
+    printlog "Export using Button in toolbar"
+    printlog "use the settings from the export before"
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '------------------------------------------------------------  Output the tenth file  ----------------------------------------------------------------
+    printlog "-------------------------  Output the tenth file  ----------------"
 
     hExportAsPDFmulti (1, TRUE, OutputGrafikTBO + 10, TRUE, FALSE, 1, 3) ' button in toolbar -> last settings have to be used
 
-    '###### range / Press optimized ######
-    '/// File->Export as PDF document ///'
-    printlog "File->Export as PDF document ///'"
-    '///+ range = all
+    printlog "File->Export as PDF document"
     printlog " range = all"
-    '///+ compression = Press optimized
     printlog " compression = Press optimized"
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '-----------------------------------------------------------  Output the eleventh file  -------------------------------------------------------------
+    printlog "-----------------  Output the eleventh file  ---------------------"
 
     hExportAsPDFmulti (3, TRUE, OutputGrafikTBO + 11, TRUE, FALSE, 2, 3, "2")
-    '/// Export using Button in toolbar
-    '///+ use the settings from the export before
-
+    printlog "Export using Button in toolbar"
+    printlog "use the settings from the export before"
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '-------------------------------------------------------------  Output the twelfth file  --------------------------------------------------------------
+    printlog "------------------  Output the twelfth file  ---------------------"
 
     hExportAsPDFmulti (1, TRUE, OutputGrafikTBO + 12, TRUE, FALSE, 2, 3) ' button in toolbar -> last settings have to be used
-
     kontext "Standardbar"
     checkexppdfwaitmax10sec
 
-    '-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+    '---------------------------------------------------------------------------
 
     for i=1 to 12
         sPath = OutputGrafikTBO
@@ -427,12 +383,12 @@ testcase tPDF
         Printlog (" - " + i + ": " + " " + iFileSize(i) + " " + sPath
         if (dir(sPath) <> "") then
             sleep(1)
-            '/// the first line has to be '%PDF-1.4' ///'
+            printlog " the first line has to be %PDF-1.4"
             sTemp = fGetFileText(sPath, 8)
             if (sTemp <> "%PDF-1.4") then
                 Warnlog "File doesn't start with '%PDF-1.4' it is: '" + sTemp + "'"
             endif
-            '/// the last line has to be '%%EOF' ///'
+            printlog "the last line has to be '%%EOF' "
             sTemp = left(fGetFileText(sPath, -6),5)
             if (sTemp <> "%%EOF") then
                 Warnlog "File doesn't end with '%%EOF' it is: '" + sTemp + "'"
@@ -442,25 +398,21 @@ testcase tPDF
         endif
     next i
 
-    ' Check if the file size is the same when exporting via toolbar and file/export
-    ' if the size different then the options are not used when exporting via the toolbar
+    printlog "Check if the file size is the same when exporting via toolbar and file/export"
+    printlog "if the size is different then the options are not used when exporting via the toolbar"
     if (iFileSize(1) <> iFileSize(2)) then
         qaerrorlog "i100919: pdf export: different file size when exporting with file/export or button"
         'Warnlog ("Diffrence in filesize for file 1 and 2")
     endif
-    ' print optimized
     if (iFileSize(5) <> iFileSize(6)) then
         qaerrorlog "i100919: pdf export: different file size when exporting with file/export or button"
         'Warnlog ("Difference in filesize for file 5 and 6")
     endif
-    ' press optimized
     if (iFileSize(9) <> iFileSize(10)) then
         qaerrorlog "i100919: pdf export: different file size when exporting with file/export or button"
         'Warnlog ("Difference in filesize for file 9 and 10")
     endif
 
-    
-
     if (iFileSize(1) > iFileSize(5)) then
     qaerrorlog "i100919: pdf export: different file size when exporting with file/export or button"
         'Warnlog ("Filesize for file 1 is greater then for file 5. The compression level doesn't work.")
@@ -1357,31 +1309,31 @@ endcase 'tWMF
 '-------------------------------------------------------------------------
 
 function fGetFileText (sFilename as string, iCount as long) as string
-'/// This function is for getting  the first or last n characters of a file
-'///+<u>Input</u>:<ul><li>filename</li><li>number</li></ul>If the number greater 0 then get n characters from start.
-'///+A number smaller 0 get from end of file.
-'///+<u>Output</u>:<ul><li>string with <b><i>n</i></b> characters</li></ul>
-
-   dim iFile as integer ' filehandle
-   dim iTem as integer  ' get 2 bytes of the file
-   dim iTemByte(2) as integer ' move 1 byte from iTem in each item
-   dim sTemp as string   ' string of file
-   dim iSize as long  ' size in bytes of file
-   dim i as long      ' runner :-)
-
-   iFile = FreeFile
-'   Printlog "FreeFile: " + iFile
-   if (dir (sFilename) <> "") then
-'      Printlog "FileLen: " + FileLen(sFile)
-      Open sFilename For binary access read shared As #iFile
-'      Printlog "Loc: " + Loc(#iFile)  ' LONG! where am i in the file?
-
-      iSize = Lof(#iFile) ' get size in bytes of file
-      if (iSize > 65530) then '65536 = 64kB
-         'Warnlog "fGetFileText: file '" + sFilename + "' might get problems on reading it? size is > 65530 Byte: '" + iSize + "'"
-      else
-'         printlog "iSize: " + iSize
-      endif
+    printlog "This function is for getting  the first or last n characters of a file"
+    printlog "Input:filename number If the number greater 0 then get n characters from start."
+    printlog "number smaller 0 get from end of file."
+    printlog "Output:string with characters"
+
+    dim iFile as integer ' filehandle
+    dim iTem as integer  ' get 2 bytes of the file
+    dim iTemByte(2) as integer ' move 1 byte from iTem in each item
+    dim sTemp as string   ' string of file
+    dim iSize as long  ' size in bytes of file
+    dim i as long      ' runner :-)
+
+    iFile = FreeFile
+    Printlog "FreeFile: " + iFile
+    if (dir (sFilename) <> "") then
+        Printlog "FileLen: " + FileLen(sFile)
+        Open sFilename For binary access read shared As #iFile
+        Printlog "Loc: " + Loc(#iFile)  ' LONG! where am i in the file?
+
+        iSize = Lof(#iFile) ' get size in bytes of file
+            if (iSize > 65530) then '65536 = 64kB
+                'Warnlog "fGetFileText: file '" + sFilename + "' might get problems on reading it? size is > 65530 Byte: '" + iSize + "'"
+            else
+                printlog "iSize: " + iSize
+            endif
 
       sTemp = ""
       if (iCount >= 0) then   ' get bytes from file start
@@ -1406,7 +1358,7 @@ function fGetFileText (sFilename as string, iCount as long) as string
             sTemp = chr(iTemByte(1)) + chr(iTemByte(2)) + sTemp  ' put them together
          endif
        endif
-'      printlog "'"+left(sTemp,iSize)+"'"  ' gotcha!
+      printlog "'"+left(sTemp,iSize)+"'"  ' gotcha!
 
       if (iSize-(Abs(iCount)) >= 0) then
          fGetFileText = left(sTemp,Abs(iCount))
diff --git a/testautomation/graphics/optional/includes/global/g_area.inc b/testautomation/graphics/optional/includes/global/g_area.inc
index 758044290d45..eb53faaa9bb3 100644
--- a/testautomation/graphics/optional/includes/global/g_area.inc
+++ b/testautomation/graphics/optional/includes/global/g_area.inc
@@ -39,341 +39,378 @@ testcase tiFormatArea
     Dim Zaehler
     dim Entf$
 
-   hNewDocument            '/// New impress document ///'
-   hRechteckErstellen (20,20,60,60)         '/// create rectangle ///'
-   Printlog "  - Change Format"          '/// change format for the rectangle ///'
-   FormatArea
-   Kontext
-   active.SetPage TabArea
-   Kontext "TabArea"
-   FillOptions.Select 5  '/// apply bitmap as texture ///'
-   BitmapList.Select 3   '/// Select "Water" ///'
-   Tile.Check            '/// tile bitmap ///'
-   Kontext
-   active.SetPage TabSchatten
-   kontext "TabSchatten"
-   Anzeigen.Check           '/// apply shadow ///'
-   Entfernung.SetText "30"          '/// set angle to 30���///'
-   Entf$=Entfernung.GetText          '/// change distance ///'
-   Farbe.Select 15           '/// select color 15///'
-   TabSchatten.OK           '/// close dialog ///'
-   Sleep 3
+    printlog "New impress document "
+    hNewDocument
+    printlog "create rectangle "
+    hRechteckErstellen (20,20,60,60)
+    Printlog "  - Change Format"
+    printlog "change format for the rectangle "
+    FormatArea
+    Kontext
+    active.SetPage TabArea
+    Kontext "TabArea"
+    printlog "apply bitmap as texture "
+    FillOptions.Select 5
+    printlog "Select Water "
+    BitmapList.Select 3
+    printlog "tile bitmap "
+    Tile.Check
+    Kontext
+    active.SetPage TabSchatten
+    kontext "TabSchatten"
+    printlog "apply shadow "
+    Anzeigen.Check
+    printlog "set angle to 30���"
+    Entfernung.SetText "30"
+    printlog "change distance "
+    Entf$=Entfernung.GetText
+    printlog "select color 15"
+    Farbe.Select 15
+    printlog "close dialog "
+    TabSchatten.OK
+    Sleep 3
 
-  Printlog "  - Test various formats"
-   FormatArea            '/// Format area, check if changes are saved for this object ///'
-   Kontext
-   active.SetPage TabArea
-   Kontext "TabArea"
-   if NOT FillOptions.GetSelIndex = 5 then
-      Warnlog "Bitmap is not checked"
-   else
-      if BitmapList.GetSelIndex <> 3 then Warnlog "Wrong bitmap used. "+ BitmapAuswahl.GetSelIndex
-      if NOT Tile.IsChecked then Warnlog "Tile is not checked"
-'      if Original.IsChecked then Warnlog "Original is not checked"
-'      if NOT Relativ.IsChecked then Warnlog "Relative is not checked"
-'      if Breite.GetText <> "90 %" then Warnlog "Width is not 90%, it is:  "+Breite.GetText
-'      if XOffset.GetText <> "30 %" then Warnlog "XOffset is not 30%, it is:  "+XOffset.GetText
-'      if NOT Zeile.IsChecked then Warnlog "Line is not checked"
-'      if Verschiebung.GetText <> "20 %" then Warnlog "Displace is not 20%, it is:  " + Verschiebung.GetText
-      Kontext
-      active.SetPage TabSchatten
-      kontext "TabSchatten"
-      if NOT Anzeigen.IsChecked then
-         Warnlog "Show shadows is not checked"
-      else
-         if Entfernung.GetText <> Entf$ then Warnlog "Distance is not " + Entf$ + " it is: "+ Entfernung.GetText
-         if Farbe.GetSelIndex <> 15 then Warnlog "Wrong color for shadow. It is: "+ Farbe.GetSelIndex
-      end if
-  end if
+    Printlog "  - Test various formats"
+    printlog "Format area, check if changes are saved for this object "
+    FormatArea
+    Kontext
+    active.SetPage TabArea
+    Kontext "TabArea"
+    if NOT FillOptions.GetSelIndex = 5 then
+        Warnlog "Bitmap is not checked"
+    else
+        if BitmapList.GetSelIndex <> 3 then Warnlog "Wrong bitmap used. "+ BitmapAuswahl.GetSelIndex
+        if NOT Tile.IsChecked then Warnlog "Tile is not checked"
+        '      if Original.IsChecked then Warnlog "Original is not checked"
+        '      if NOT Relativ.IsChecked then Warnlog "Relative is not checked"
+        '      if Breite.GetText <> "90 %" then Warnlog "Width is not 90%, it is:  "+Breite.GetText
+        '      if XOffset.GetText <> "30 %" then Warnlog "XOffset is not 30%, it is:  "+XOffset.GetText
+        '      if NOT Zeile.IsChecked then Warnlog "Line is not checked"
+        '      if Verschiebung.GetText <> "20 %" then Warnlog "Displace is not 20%, it is:  " + Verschiebung.GetText
+            Kontext
+            active.SetPage TabSchatten
+            kontext "TabSchatten"
+                if NOT Anzeigen.IsChecked then
+                Warnlog "Show shadows is not checked"
+            else
+            if Entfernung.GetText <> Entf$ then Warnlog "Distance is not " + Entf$ + " it is: "+ Entfernung.GetText
+            if Farbe.GetSelIndex <> 15 then Warnlog "Wrong color for shadow. It is: "+ Farbe.GetSelIndex
+            end if
+            end if
    TabSchatten.Cancel
-
-   hCloseDocument              '/// close document ///'
+   printlog "close document "
+   hCloseDocument              
     
 endcase 'tiFormatArea
 '--------------------------------------------------------
 testcase tdFormatArea1
 
-Dim i
-Dim j
-Dim k
-Dim m
-Dim n
-Dim Winkel_1 as string
-Dim ZaehlerFarbe
-Dim ZaehlerVerlauf
-Dim ZaehlerSchraffur
-Dim ZaehlerBitmap
-Dim ColorName$
+    Dim i
+    Dim j
+    Dim k
+    Dim m
+    Dim n
+    Dim Winkel_1 as string
+    Dim ZaehlerFarbe
+    Dim ZaehlerVerlauf
+    Dim ZaehlerSchraffur
+    Dim ZaehlerBitmap
+    Dim ColorName$
     ColorName$ = "Bullshit"
-  dim Zaehler as integer
+    dim Zaehler as integer
 
- Call hNewDocument         '/// new document ///'
-  sleep 3
-  Call hRechteckErstellen (30,30,70,70)       '/// create rectangle ///'
-  sleep 2
-  FormatArea          '/// format area ///'
-  Kontext
-  Active.SetPage TabArea
-  Kontext "TabArea"
-  FillOptions.Select 1         '/// Select no fill ///'
-  sleep 2
-  TabArea.OK
-  sleep 1
-  FormatArea
-  Kontext
-  Active.SetPage TabArea
-  Kontext "TabArea"
-  sleep 1          '/// control if changes are still there after closing and reopening dialog ///'
-  FillOptions.Select 3'/// check gradient and select 1 ///'
-  ZaehlerVerlauf = GradientList.GetItemCount
-   for j = 1 To 2
-    GradientList.Select j
-       TabArea.OK
-       FormatArea
-       Kontext
-       Active.SetPage TabArea
-       Kontext "TabArea"
-       PrintLog GradientList.GetSelText
-   next j
-  FillOptions.Select 4         '/// select hatching, control after closing and reopening dialog if changes are recognized ///'
-  HatchingList.GetItemCount
-  ZaehlerSchraffur = HatchingList.GetItemCount
-   for k=1 to 2'ZaehlerSchraffur
-       HatchingList.Select k
-       TabArea.OK
-       FormatArea
-       Kontext
-       Active.SetPage TabArea
-       Kontext "TabArea"
-       PrintLog HatchingList.GetSelText
+    printlog "new document "
+    Call hNewDocument
+    sleep 3
+    printlog "create rectangle "
+    Call hRechteckErstellen (30,30,70,70)
+    sleep 2
+    printlog "format area "
+    FormatArea
+    Kontext
+    Active.SetPage TabArea
+    Kontext "TabArea"
+    printlog "Select no fill "
+    FillOptions.Select 1
+    sleep 2
+    TabArea.OK
+    sleep 1
+    FormatArea
+    Kontext
+    Active.SetPage TabArea
+    Kontext "TabArea"
+    sleep 1
+    printlog "control if changes are still there after closing and reopening dialog "
+    printlog "check gradient and select 1 "
+    FillOptions.Select 3'
+    ZaehlerVerlauf = GradientList.GetItemCount
+    for j = 1 To 2
+        GradientList.Select j
+        TabArea.OK
+        FormatArea
+        Kontext
+        Active.SetPage TabArea
+        Kontext "TabArea"
+        PrintLog GradientList.GetSelText
+    next j
+    printlog "select hatching, control after closing and reopening dialog if changes are recognized "
+    FillOptions.Select 4
+    HatchingList.GetItemCount
+    ZaehlerSchraffur = HatchingList.GetItemCount
+    for k=1 to 2'ZaehlerSchraffur
+        HatchingList.Select k
+        TabArea.OK
+        FormatArea
+        Kontext
+        Active.SetPage TabArea
+        Kontext "TabArea"
+        PrintLog HatchingList.GetSelText
   next k
 
-  FillOptions.Select 5          '/// check bitmap, control if changes are permanent after closing and reopening dialog ///'
-  BitmapList.GetItemCount
-  ZaehlerBitmap = BitmapList.GetItemCount
-   for n=1 to ZaehlerBitmap
-       BitmapList.Select n
-       TabArea.OK
-       FormatArea
-       sleep 1
-       Kontext
-       Active.SetPage TabArea
-       Kontext "TabArea"
-       PrintLog BitmapList.GetSelText
-   next n
+    printlog "check bitmap, control if changes are permanent after closing and reopening dialog "
+    FillOptions.Select 5
+    BitmapList.GetItemCount
+    ZaehlerBitmap = BitmapList.GetItemCount
+    for n=1 to ZaehlerBitmap
+        BitmapList.Select n
+        TabArea.OK
+        FormatArea
+        sleep 1
+        Kontext
+        Active.SetPage TabArea
+        Kontext "TabArea"
+        PrintLog BitmapList.GetSelText
+    next n
 
-  if Tile.IsChecked = False Then Tile.Check      '/// check tile ///'
-'  if Anpassen.IsEnabled = False Then PrintLog " Option Tile activated"
-'  if Anpassen.IsEnabled = True Then WarnLog " Option Tile not activated"
-'  if Relativ.IsChecked = False Then
-'     SetClipboard Breite.GetText
-'     Relativ.Check
-'   If Breite.GetText = GetClipboardText Then
-'   WarnLog "  Relative isnt working"
-'   else
-'   PrintLog "   Relative works"
-'   end if
-'  end if
-'
-'  if Kacheln.IsChecked = True Then Kacheln.UnCheck
-'  Anpassen.Check
-'  if Relativ.IsEnabled = True Then WarnLog "   Option Anpassen konnte nicht aktiviert werden"
-'  if not Relativ.IsEnabled Then PrintLog "   Option Anpassen funktioniert"
-'  Anpassen.Uncheck
-'  Original.Check
-'  if Breite.IsEnabled And Hoehe.IsEnabled = True Then WarnLog "   Button Original funktioniert nicht"
-'  if Breite.IsEnabled And Hoehe.IsEnabled = False Then PrintLog "   Button Original funktioniert"
-'  Kacheln.Check
-'  setClipboard XOffset.GetText
-'  XOffset.More 3
-'  if XOffset.GetText <> GetClipboardText Then PrintLog "   Position XOffset funktioniert"
-'  if XOffset.GetText = GetClipboardText Then WarnLog "    Position XOffset funktioniert nicht"
-'  SetClipboard YOffset.GetText
-'  YOffset.More 5
-'  if YOffset.GetText <> GetClipboardText Then PrintLog "   Position YOffset funktioniert"
-'  if YOffset.GetText = GetClipboardText Then WarnLog "    Position YOffset funktioniert nicht"
-'  PrintLog "        TabArea fertig"
-  Kontext
-  Active.SetPage TabSchatten
-  Kontext "TabSchatten"
-   sleep 1
-  if Anzeigen.IsChecked = True Then Anzeigen.UnCheck     '/// uncheck shadow ///'
-   sleep 1
-  if Entfernung.IsEnabled = False Then        '/// check if shadow related controls are disabled with no shadow ///'
-     PrintLog "   Show shadow works"
-  else
-     WarnLog "   Show shadow does not work"
-  end if
+    printlog "check tile "
+    if Tile.IsChecked = False Then Tile.Check
+    '  if Anpassen.IsEnabled = False Then PrintLog " Option Tile activated"
+    '  if Anpassen.IsEnabled = True Then WarnLog " Option Tile not activated"
+    '  if Relativ.IsChecked = False Then
+    '     SetClipboard Breite.GetText
+    '     Relativ.Check
+    '   If Breite.GetText = GetClipboardText Then
+    '   WarnLog "  Relative isnt working"
+    '   else
+    '   PrintLog "   Relative works"
+    '   end if
+    '  end if
+    '
+    '  if Kacheln.IsChecked = True Then Kacheln.UnCheck
+    '  Anpassen.Check
+    '  if Relativ.IsEnabled = True Then WarnLog "   Option Anpassen konnte nicht aktiviert werden"
+    '  if not Relativ.IsEnabled Then PrintLog "   Option Anpassen funktioniert"
+    '  Anpassen.Uncheck
+    '  Original.Check
+    '  if Breite.IsEnabled And Hoehe.IsEnabled = True Then WarnLog "   Button Original funktioniert nicht"
+    '  if Breite.IsEnabled And Hoehe.IsEnabled = False Then PrintLog "   Button Original funktioniert"
+    '  Kacheln.Check
+    '  setClipboard XOffset.GetText
+    '  XOffset.More 3
+    '  if XOffset.GetText <> GetClipboardText Then PrintLog "   Position XOffset funktioniert"
+    '  if XOffset.GetText = GetClipboardText Then WarnLog "    Position XOffset funktioniert nicht"
+    '  SetClipboard YOffset.GetText
+    '  YOffset.More 5
+    '  if YOffset.GetText <> GetClipboardText Then PrintLog "   Position YOffset funktioniert"
+    '  if YOffset.GetText = GetClipboardText Then WarnLog "    Position YOffset funktioniert nicht"
+    '  PrintLog "        TabArea fertig"
+    Kontext
+    Active.SetPage TabSchatten
+    Kontext "TabSchatten"
+    sleep 1
+    printlog "uncheck shadow "
+    if Anzeigen.IsChecked = True Then Anzeigen.UnCheck
+        sleep 1
+        printlog "check if shadow related controls are disabled with no shadow "
+    if Entfernung.IsEnabled = False Then
+        PrintLog "   Show shadow works"
+    else
+        WarnLog "   Show shadow does not work"
+    end if
 
-  Anzeigen.Check         '/// check shadow ///'
-  SetClipboard Entfernung.GetText       '/// change distance ///'
-  Entfernung.More 4
-  if GetClipboardText = Entfernung.GetText Then
-     WarnLog "   Distance does not work"
-  else
-     PrintLog "   Distance does work"
-  end if
-  Farbe.Select 5         '/// change shadow color ///'
+    printlog "check shadow "
+    Anzeigen.Check
+    printlog "change distance "
+    SetClipboard Entfernung.GetText
+    Entfernung.More 4
+    if GetClipboardText = Entfernung.GetText Then
+        WarnLog "   Distance does not work"
+    else
+        PrintLog "   Distance does work"
+    end if
+    printlog "change shadow color "
+    Farbe.Select 5
 
-  Kontext
-  Active.SetPage TabFarben
-  Kontext "TabFarben"
-  Farbe.Select 24
-   sleep 1
-  Farbe.Select 18
-   sleep 1
-  Farbe.Select 7
-  Farbname.SetText "Bullshit"       '/// change color ///'
-  Aendern.Click
-   sleep 1
-  TabFarben.OK
-  FormatArea
-  Kontext
-  Active.SetPage TabArea
-  Kontext "TabArea"
-  FillOptions.Select 2
-  if ColourList.GetSelText = "Bullshit" Then
-     PrintLog " Color selection changed "
-  else
-     WarnLog " Color selection not changed"
-  end if
-  Kontext
-  Active.SetPage TabFarben
-  Kontext "TabFarben"
-  Farbmodell.Select 1
+    Kontext
+    Active.SetPage TabFarben
+    Kontext "TabFarben"
+    Farbe.Select 24
+    sleep 1
+    Farbe.Select 18
+    sleep 1
+    Farbe.Select 7
+    printlog "change color "
+    Farbname.SetText "Bullshit"
+    Aendern.Click
+    sleep 1
+    TabFarben.OK
+    FormatArea
+    Kontext
+    Active.SetPage TabArea
+    Kontext "TabArea"
+    FillOptions.Select 2
+    if ColourList.GetSelText = "Bullshit" Then
+        PrintLog " Color selection changed "
+    else
+        WarnLog " Color selection not changed"
+    end if
+    Kontext
+    Active.SetPage TabFarben
+    Kontext "TabFarben"
+    Farbmodell.Select 1
 
- Kontext
- Active.SetPage TabFarben        '/// test RGB color model ///'
- Kontext "TabFarben"
- Farbmodell.Select 1        '/// switch to RGB values ///' ' 33:RVB,CMJN
- printlog "   Selected colourmodel RGB?: "+Farbmodell.GetSelText
-   if left(Farbmodell.GetSelText,1) <> "R" then warnlog "not RGB selected ? :-("
- try
-   R.SetText "50"
-   G.SetText "10"
-   B.SetText "90"
- catch
-   warnlog "RGB text fields are not enabled :-("
- endcatch
- Aendern.Click
- TabFarben.OK
- Kontext "DocumentDraw"
- FormatArea
- Kontext
- Active.SetPage TabFarben
- Kontext "TabFarben"
- if (R.GetText = "50" And G.GetText = "10" And B.GetText = "90") Then
-    PrintLog "Changes in RGB done"
- else
-    WarnLog " Chancges in RGB values not recognized, instead of R=50 , G=10 und B=90  it is " +R.GetText + " " + G.GetText + " " + B.GetText
- end if
- Farbe.Select 10
- FarbName.SetText "Brighter"        '/// add a color ///'
- Hinzufuegen.Click
- Farbe.Select "Brighter"
- Loeschen.Click          '/// delete color ///'
- Kontext "Active"
- Active.Yes
- Kontext
- Active.SetPage TabFarben
- Kontext "TabFarben"
- Bearbeiten.Click         '/// edit color ///'
- Kontext  "FarbeDlg"
- FarbeDlg.OK
- sleep 2
- Kontext
- Active.SetPage TabFarben
- Kontext "TabFarben"
- TabFarben.OK
- FormatArea
- Kontext
- Active.SetPage TabFarben
- Kontext "TabFarben"
- TabFarben.OK
+    Kontext
+    printlog "test RGB color model "
+    Active.SetPage TabFarben
+    Kontext "TabFarben"
+    printlog "switch to RGB values " ' 33:RVB,CMJN
+    Farbmodell.Select 1
+    printlog "   Selected colourmodel RGB?: "+Farbmodell.GetSelText
+    if left(Farbmodell.GetSelText,1) <> "R" then warnlog "not RGB selected ? :-("
+        try
+        R.SetText "50"
+        G.SetText "10"
+        B.SetText "90"
+    catch
+        warnlog "RGB text fields are not enabled :-("
+    endcatch
+    Aendern.Click
+    TabFarben.OK
+    Kontext "DocumentDraw"
+    FormatArea
+    Kontext
+    Active.SetPage TabFarben
+    Kontext "TabFarben"
+    if (R.GetText = "50" And G.GetText = "10" And B.GetText = "90") Then
+        PrintLog "Changes in RGB done"
+    else
+        WarnLog " Chancges in RGB values not recognized, instead of R=50 , G=10 und B=90  it is " +R.GetText + " " + G.GetText + " " + B.GetText
+    end if
+    Farbe.Select 10
 
- FormatArea
- Kontext
- Active.SetPage TabFarbverlaeufe
- Kontext "TabFarbverlaeufe"
- TabFarbverlaeufe.OK
- sleep 2
+    FarbName.SetText "Brighter"
+    printlog "add a color "
+    Hinzufuegen.Click
+    Farbe.Select "Brighter"
+    printlog "delete color "
+    Loeschen.Click
+    Kontext "Active"
+    Active.Yes
+    Kontext
+    Active.SetPage TabFarben
+    Kontext "TabFarben"
+    printlog "edit color "
+    Bearbeiten.Click
+    Kontext  "FarbeDlg"
+    FarbeDlg.OK
+    sleep 2
+    Kontext
+    Active.SetPage TabFarben
+    Kontext "TabFarben"
+    TabFarben.OK
+    FormatArea
+    Kontext
+    Active.SetPage TabFarben
+    Kontext "TabFarben"
+    TabFarben.OK
+
+    FormatArea
+    Kontext
+    Active.SetPage TabFarbverlaeufe
+    Kontext "TabFarbverlaeufe"
+    TabFarbverlaeufe.OK
+    sleep 2
 
-FormatArea
- sleep 2
- Kontext
- Active.SetPage TabTransparenz
- Kontext "TabTransparenz"
- KeineTransparenz.Check         '/// check if controls are disabled if transparence is disabled ///'
+    FormatArea
+    sleep 2
+    Kontext
+    Active.SetPage TabTransparenz
+    Kontext "TabTransparenz"
+    printlog "check if controls are disabled if transparence is disabled "
+    KeineTransparenz.Check
     Printlog "- No transparency is checked, all controls should be disabled."
-  if MFLinTransparenz.IsEnabled Then Warnlog "- Transparency enabled"
-  if TransparenzverlaufTyp.IsEnabled Then Warnlog "- Graidient enabled"
-  if MFZentrumX.IsEnabled Then Warnlog "- Center X enabled"
-  if MFZentrumY.IsEnabled Then Warnlog "- Center Y enabled"
-  if MFWinkel.IsEnabled Then Warnlog "- Angle enabled"
-  if MFRand.IsEnabled Then Warnlog "- Border enabled"
-  if MFStartwert.IsEnabled Then Warnlog "- Start value enabled"
-  if MFEndwert.IsEnabled Then Warnlog "- End value enabled"
+    if MFLinTransparenz.IsEnabled Then Warnlog "- Transparency enabled"
+    if TransparenzverlaufTyp.IsEnabled Then Warnlog "- Graidient enabled"
+    if MFZentrumX.IsEnabled Then Warnlog "- Center X enabled"
+    if MFZentrumY.IsEnabled Then Warnlog "- Center Y enabled"
+    if MFWinkel.IsEnabled Then Warnlog "- Angle enabled"
+    if MFRand.IsEnabled Then Warnlog "- Border enabled"
+    if MFStartwert.IsEnabled Then Warnlog "- Start value enabled"
+    if MFEndwert.IsEnabled Then Warnlog "- End value enabled"
 
- LineareTransparenz.Check        '/// check linear tranparency ///'
-    Printlog "- Set transparency to linear, all controls should be enabled now"  '/// control if related controls are now enabled ///'
-  sleep 1
-  MFLinTransparenz.ToMax        '/// change values of controls ///'
-   if MFLinTransparenz.GetText <>"100%" Then Warnlog "- Maximum value not correct"
-  MFLinTransparenz.ToMin
-   if MFLinTransparenz.GetText <>"0%" Then Warnlog "- Minimum value not correct"
-   if TransparenzverlaufTyp.IsEnabled Then Warnlog "- Gradient enabled"
-   if MFZentrumX.IsEnabled Then Warnlog "- Centrum X enabled"
-   if MFZentrumY.IsEnabled Then Warnlog "- Centrum Y enabled"
-   if MFWinkel.IsEnabled Then Warnlog "- Angle enabled"
-   if MFRand.IsEnabled Then Warnlog "- Border enabled"
-   if MFStartwert.IsEnabled Then Warnlog "- Start value enabled"
-   if MFEndwert.IsEnabled Then Warnlog "- End value enabled"
+    printlog "check linear tranparency "
+    LineareTransparenz.Check
+    Printlog "- Set transparency to linear, all controls should be enabled now"
+    sleep 1
+    printlog "change values of controls "
+    MFLinTransparenz.ToMax
+    if MFLinTransparenz.GetText <>"100%" Then Warnlog "- Maximum value not correct"
+    MFLinTransparenz.ToMin
+    if MFLinTransparenz.GetText <>"0%" Then Warnlog "- Minimum value not correct"
+    if TransparenzverlaufTyp.IsEnabled Then Warnlog "- Gradient enabled"
+    if MFZentrumX.IsEnabled Then Warnlog "- Centrum X enabled"
+    if MFZentrumY.IsEnabled Then Warnlog "- Centrum Y enabled"
+    if MFWinkel.IsEnabled Then Warnlog "- Angle enabled"
+    if MFRand.IsEnabled Then Warnlog "- Border enabled"
+    if MFStartwert.IsEnabled Then Warnlog "- Start value enabled"
+    if MFEndwert.IsEnabled Then Warnlog "- End value enabled"
 
- Transparenzverlauf.Check
+    Transparenzverlauf.Check
     Printlog "- Gradient for transprency enabled"
-  if MFLinTransparenz.IsEnabled = "false" Then Warnlog "- Transparency disabled"
-  if TransparenzverlaufTyp.IsEnabled = "false"  Then Warnlog "- Gradient disabled"
-  if MFZentrumX.IsEnabled = "false" Then Warnlog "- Center X disabled"
-  if MFZentrumY.IsEnabled = "false" Then Warnlog "- Center Y disabled"
-  if MFWinkel.IsEnabled = "false" Then Warnlog "- Anlge disabled"
-  if MFRand.IsEnabled = "false" Then Warnlog "- Border disabled"
-  if MFStartwert.IsEnabled = "false" Then Warnlog "- Start value disabled"
-  if MFEndwert.IsEnabled = "false" Then Warnlog "- End value disabled"
+    if MFLinTransparenz.IsEnabled = "false" Then Warnlog "- Transparency disabled"
+    if TransparenzverlaufTyp.IsEnabled = "false"  Then Warnlog "- Gradient disabled"
+    if MFZentrumX.IsEnabled = "false" Then Warnlog "- Center X disabled"
+    if MFZentrumY.IsEnabled = "false" Then Warnlog "- Center Y disabled"
+    if MFWinkel.IsEnabled = "false" Then Warnlog "- Anlge disabled"
+    if MFRand.IsEnabled = "false" Then Warnlog "- Border disabled"
+    if MFStartwert.IsEnabled = "false" Then Warnlog "- Start value disabled"
+    if MFEndwert.IsEnabled = "false" Then Warnlog "- End value disabled"
 
     Printlog "- Check if changed values are saved"
 
-  Zaehler=TransparenzverlaufTyp.GetItemCount
-  for i=1 to Zaehler
-      TransparenzverlaufTyp.Select i
-      SetClipboard Transparenzverlauftyp.GetSelText
-      TabTransparenz.OK
-     sleep 2
+    Zaehler=TransparenzverlaufTyp.GetItemCount
+    for i=1 to Zaehler
+        TransparenzverlaufTyp.Select i
+        SetClipboard Transparenzverlauftyp.GetSelText
+        TabTransparenz.OK
+        sleep 2
+        FormatArea
+        sleep 1
+        Kontext
+        printlog "check if values are saved after closing and reopening dialog "
+        Active.SetPage TabTransparenz
+        Kontext "TabTransparenz"
+        if not Transparenzverlauftyp.GetSelIndex = i Then Warnlog "- Values are not correct for gradient transparency"
+    next i
+    TransparenzverlaufTyp.Select 2
+    if MFZentrumX.IsEnabled Then Warnlog "- Center X should not be enabled"
+    if MFZentrumY.IsEnabled Then Warnlog "- Center Y should not be enabled"
+    MFWinkel.SetText "45"
+    Winkel_1 = MFWinkel.GetText
+    TabTransparenz.OK
+    sleep 2
     FormatArea
-     sleep 1
-      Kontext
-      Active.SetPage TabTransparenz        '/// check if values are saved after closing and reopening dialog ///'
-      Kontext "TabTransparenz"
-       if not Transparenzverlauftyp.GetSelIndex = i Then Warnlog "- Values are not correct for gradient transparency"
-   next i
-  TransparenzverlaufTyp.Select 2
-   if MFZentrumX.IsEnabled Then Warnlog "- Center X should not be enabled"
-   if MFZentrumY.IsEnabled Then Warnlog "- Center Y should not be enabled"
-   MFWinkel.SetText "45"
-   Winkel_1 = MFWinkel.GetText
-   TabTransparenz.OK
-   sleep 2
-   FormatArea
-   sleep 2
-   Kontext
-   Active.SetPage TabTransparenz
-   Kontext "TabTransparenz"
+    sleep 2
+    Kontext
+    Active.SetPage TabTransparenz
+    Kontext "TabTransparenz"
     if TransparenzverlaufTyp.GetSelIndex <>2 Then
-       Warnlog "- Second menu-item is not choosen"
+        Warnlog "- Second menu-item is not choosen"
     end if
     TransparenzverlaufTyp.Select 3
-     if MFWinkel.GetText <> Winkel_1 then Warnlog "- The inserted value is not accepted"
-     if MFWinkel.GetText <> Winkel_1 Then TransparenzverlaufTyp.Select 3
-     if MFWinkel.IsEnabled Then Warnlog " - Angle should not be active when Radial is choosen"
+    if MFWinkel.GetText <> Winkel_1 then Warnlog "- The inserted value is not accepted"
+    if MFWinkel.GetText <> Winkel_1 Then TransparenzverlaufTyp.Select 3
+    if MFWinkel.IsEnabled Then Warnlog " - Angle should not be active when Radial is choosen"
     sleep 1
     MFZentrumX.SetText "30"
     MFZentrumY.SetText "30"
@@ -384,8 +421,8 @@ FormatArea
     Kontext
     Active.SetPage TabTransparenz
     Kontext "TabTransparenz"
-     if MFZentrumX.GetText <> "30%" Then Warnlog "- Setted value for Center X is not applied."
-     if MFZentrumY.GetText <> "30%" Then Warnlog "- Setted value for Center Y is not applied."
+    if MFZentrumX.GetText <> "30%" Then Warnlog "- Setted value for Center X is not applied."
+    if MFZentrumY.GetText <> "30%" Then Warnlog "- Setted value for Center Y is not applied."
     MFRand.SetText "10"
     MFStartwert.SetText "20"
     MFEndwert.SetText "30"
@@ -396,12 +433,13 @@ FormatArea
     Kontext
     Active.SetPage TabTransparenz
     Kontext "TabTransparenz"
-     if MFRand.GetText <> "10%" Then Warnlog "- Border-value was not set."
-     if MFEndwert.GetText <> "30%" Then Warnlog "- End-value was not set."
-     if MFStartwert.GetText <> "20%" Then Warnlog "- Start-value was not set."
+    if MFRand.GetText <> "10%" Then Warnlog "- Border-value was not set."
+    if MFEndwert.GetText <> "30%" Then Warnlog "- End-value was not set."
+    if MFStartwert.GetText <> "20%" Then Warnlog "- Start-value was not set."
     TabTransparenz.OK
 
- Call hCloseDocument          '/// close document ///'
+    printlog "close document "
+    Call hCloseDocument
 
 endcase 'tdFormatArea1
 
diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
index 48c6599efa72..29557214638b 100644
--- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc
+++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
@@ -32,12 +32,22 @@
 '\******************************************************************************
 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_ ///
-   call hNewDocument
+    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_ ///
+    call hNewDocument
+    if gApplication = "DRAW" then
+        kontext "DocumentDraw"
+        DocumentDraw.UseMenu
+    else
+        kontext "DocumentImpress"
+        DocumentImpress.UseMenu
+    end if
+    
+    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  ///'
diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
index 731c9e0ed21f..42e3bc745ab4 100644
--- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc
+++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
@@ -38,13 +38,6 @@
 '*
 '\*******************************************************************
 
-' Tools->Autocorrect...
-' Replace; Exceptions; Options; Custom Quotes
-' these are Language
-' dependant in the
-' listbox above!!
-' box only enabled, if the both tabpages are selected ...
-
 testcase tToolsAutocorrectReplace
 
     dim i as integer
@@ -76,7 +69,9 @@ testcase tToolsAutocorrectReplace
     TabErsetzung.OK
 
     hCloseDocument
-endcase
+endcase 'tToolsAutocorrectReplace
+
+'-------------------------------------------------------------------------------
 
 testcase tToolsAutocorrectExceptions
     dim i as integer
@@ -119,9 +114,10 @@ testcase tToolsAutocorrectExceptions
     TabAusnahmen.OK
 
     hCloseDocument
-endcase
+endcase 'tToolsAutocorrectExceptions
 
 '-------------------------------------------------------------------------------
+
 testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
 
     ' bSinple = true: use simple quotes ;; else Double Quotes
@@ -151,8 +147,6 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
         warnlog "The language-file was not found or accessible! The test ends."
         goto endsub
     endif
-
-    'HDE has same problems in w_106a.inc ;-) !!! migrate ?!?! ///'
     Call hNewDocument
 
     hFileOpen sFileName
@@ -381,7 +375,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
     sleep 1
 
     hCloseDocument
-endcase
+endcase 'tToolsAutocorrectCustomQuotes
 
 '-------------------------------------------------------------------------------
 testcase tToolsAutocorrectOption
@@ -455,6 +449,6 @@ testcase tToolsAutocorrectOption
 
     hCloseDocument
     sleep 1
-endcase
+endcase 'tToolsAutocorrectOption
 
-'-------------------------------------------------------------------------------
+'-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc
index a9d578665c5a..8d58263c74d4 100644
--- a/testautomation/graphics/optional/includes/global/g_character.inc
+++ b/testautomation/graphics/optional/includes/global/g_character.inc
@@ -42,44 +42,46 @@ testcase tFormatCharacter
    dim sTemp as string
    dim iTemp as integer
 
-   '/// open application ///'
+   printlog "open application "
    Call hNewDocument
    sleep 1
 
-   '/// create a textframe with content ///'
+   printlog "create a textframe with content "
    hTextrahmenErstellen ("This is a check, a check, a check.",10,10,60,30)
-   '/// type with keys [strg]+[home] [shift]+[end] to select the inserted text ///'
+   printlog "type with keys [strg]+[home] [shift]+[end] to select the inserted text "
    hTypeKeys "<MOD1 HOME><shift end>"
    sleep 1
 
-   '/// Format->Character ///'
+   printlog "Format->Character "
    FormatCharacter
-      sleep 1
-      '/// switch to tabpage 'Font' ///'
-      Kontext
-      Messagebox.SetPage TabFont
-      Kontext "TabFont"
-      sleep 1
-
-      '/// switch to tabpage 'Font Effects' ///'
-      Kontext
-      Messagebox.SetPage TabFontEffects
-      kontext "TabFontEffects"
-      sleep 1
-
-      '/// switch to tabpage 'Position' ///'
-      Kontext
-      Messagebox.SetPage TabFontPosition
-      Kontext "TabFontPosition"
-      sleep 1
-
-      '/// close dialog 'Character' with 'OK' ///'
-      TabFontPosition.OK
-   '/// close application ///'
+    sleep 1
+    printlog "switch to tabpage 'Font' "
+    Kontext
+    Messagebox.SetPage TabFont
+    Kontext "TabFont"
+    sleep 1
+
+    printlog "switch to tabpage 'Font Effects' "
+    Kontext
+    Messagebox.SetPage TabFontEffects
+    kontext "TabFontEffects"
+    sleep 1
+
+    printlog "switch to tabpage 'Position' "
+    Kontext
+    Messagebox.SetPage TabFontPosition
+    Kontext "TabFontPosition"
+    sleep 1
+
+    printlog "close dialog 'Character' with 'OK' "
+    TabFontPosition.OK
+    printlog "close application "
    Call hCloseDocument
    
 endcase 'tFormatCharacter
+
 '---------------------------------------------------------
+
 testcase tDialogCharacter
 
     Dim i as integer
@@ -101,11 +103,13 @@ testcase tDialogCharacter
     ToolsOptions
     hToolsOptions ( "LanguageSettings", "Languages" )
 
-    if Aktivieren.IsChecked then                                  '/// Check in what state Asian support is ///'
+    printlog "Check in what state Asian support is "
+    if Aktivieren.IsChecked then                                  
        Asiansupportsetting = TRUE
     else
+        printlog "Activate if not already activated "
        Asiansupportsetting = FALSE
-       Aktivieren.Check                                           '/// Activate if not already activated ///'
+       Aktivieren.Check                                           
     end if
 
     Kontext "ExtrasOptionenDlg"
@@ -118,8 +122,8 @@ testcase tDialogCharacter
 
     FormatCharacter
     sleep 1
-    Kontext '"Active"                  ' insert this, perhaps another
-    Active.SetPage TabFont            ' tabpage is active at open
+    Kontext '"Active"                 
+    Active.SetPage TabFont           
     Kontext "TabFont"
     CountOfThem = FontWest.GetItemCount
     for y = 1 to CountOfThem
@@ -275,12 +279,14 @@ testcase tDialogCharacter
     next y
 
     Kontext
-    Active.SetPage TabFontPosition        '/// Changes the active tab to "Position"
+    printlog "Changes the active tab to Position"
+    Active.SetPage TabFontPosition        
     Kontext "TabFontPosition"
     printlog "TabFontPosition"
     SuperScript.Check
     Super.Check
-    RelativeFontSize.ToMin         '/// Testing the "Relative Font Size"-Listbox
+    printlog "Testing the Relative Font Size-Listbox"
+    RelativeFontSize.ToMin         
     ThisIsMyTextFromControl = RelativeFontSize.GetText
 '    printlog "The Relative Font Size minimum is: " & ThisIsMyTextFromControl
     for y = 1 to 99
@@ -290,7 +296,8 @@ testcase tDialogCharacter
     next y
 
     Automatic.Check
-    ScaleWith.ToMin          '/// Testing the "Scale With"-Listbox
+    printlog "Testing the Scale With-Listbox"
+    ScaleWith.ToMin          
     ThisIsMyTextFromControl = ScaleWith.GetText
     printlog "ScaleWith minimum is:" & ThisIsMyTextFromControl
     ' ScaleWith.TypeKeys "<TAB>"
@@ -303,8 +310,10 @@ testcase tDialogCharacter
     Normal.Check
     Subscript.Check
 
-    RelativeFontSize.ToMin         '/// Testing the "Reliative Font Size"-Listbox again but this time
-    ThisIsMyTextFromControl = RelativeFontSize.GetText      '/// with "Subscript" and "Normal" Checked
+    printlog "Testing the Reliative Font Size-Listbox again but this time"
+    RelativeFontSize.ToMin
+    printlog "with Subscript and Normal Checked"
+    ThisIsMyTextFromControl = RelativeFontSize.GetText      
     printlog "The Relative Font Size minimum is: " & ThisIsMyTextFromControl
     for y = 1 to 99
         RelativeFontSize.TypeKeys "<UP>"
@@ -314,7 +323,8 @@ testcase tDialogCharacter
 
     Automatic.Check
 
-    ScaleWith.ToMin          '/// Testing the "ScaleWith"-Listbox
+    printlog "Testing the ScaleWith-Listbox"
+    ScaleWith.ToMin          
     ThisIsMyTextFromControl = ScaleWith.GetText
     printlog "The ScaleWith Size is: " & ThisIsMyTextFromControl
     for y = 1 to 100
@@ -323,13 +333,15 @@ testcase tDialogCharacter
 '        printlog "The ScaleWith Size is: " & ThisIsMyTextFromControl
     next y
 
-    ThisIsMyTextFromControl = Spacing.GetSelText      '/// Testing the "Spacing"-ListBox
+    printlog "Testing the Spacing-ListBox"
+    ThisIsMyTextFromControl = Spacing.GetSelText      
     printlog "The Spacing is first: " & ThisIsMyTextFromControl
     for y = 2 to 3
         Spacing.Select y
         ThisIsMyTextFromControl = Spacing.GetSelText
         printlog "The Spacing is: " & ThisIsMyTextFromControl
-        ThisIsMyTextFromControl = SpacingBy.GetText      '/// Testing the "Spacing By"-Scrollbox
+        printlog "Testing the Spacing By-Scrollbox"
+        ThisIsMyTextFromControl = SpacingBy.GetText      
 '        printlog "The SpacingBy Size minimum is: " & ThisIsMyTextFromControl
         SpacingBy.ToMin
         for z = 1 to 4
@@ -347,7 +359,8 @@ testcase tDialogCharacter
        kontext
        ToolsOptions
        hToolsOptions ( "LanguageSettings", "Languages" )
-       Aktivieren.UnCheck                                    '/// Deactivate if not already deactivated ///'
+       printlog "Deactivate if not already deactivated "
+       Aktivieren.UnCheck                                    
        Printlog "Reseted the Asiansupport-value to it's original state"
 
        Kontext "ExtrasOptionenDlg"
@@ -385,41 +398,41 @@ testcase tSetFormatCharacter
    end if
 
     sFile = convertPath(gTesttoolpath + "graphics\required\input\spellb_" + iSprache + "."+ExtensionString)
-    '/// create document, if it doesn't exist, else skip this case :-) ///'
+    printlog "create document, if it doesn't exist, else skip this case :-) "
     if (dir(sFile)="") then
-        '/// open application ///'
+        printlog "open application "
         Call  hNewDocument
 
-        '/// activate all languages in options ///'
-        '///+ Tools->Options ///'
+        printlog "activate all languages in options "
+        '///+ Tools->Options "
         ToolsOptions
-        '///+ select tabpage 'Languages' from set 'Language Settings' ///'
+        '///+ select tabpage 'Languages' from set 'Language Settings' "
         hToolsOptions("LANGUAGESETTINGS","Languages")
         kontext "TabSprachen"
-        '///+ save state and check checkbox 'Asian languages support' ///'
-        '/// if the language is Asian, skip this part ///'
+        '///+ save state and check checkbox 'Asian languages support' "
+        printlog "if the language is Asian, skip this part "
         printlog "iSprache = " + iSprache
         if bAsianLan = FALSE then
            bAsian = Aktivieren.isEnabled
            Aktivieren.check
         endif
-        '///+ save state and  check checkbox 'Complex text layout (CTL) support' ///'
+        '///+ save state and  check checkbox 'Complex text layout (CTL) support' "
         bComplex = ComplexScriptEnabled.isEnabled
         ComplexScriptEnabled.check
-        '///+ close dialog 'Options' with OK ///'
+        '///+ close dialog 'Options' with OK "
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
 
-        '/// get count of languages ///'
-        '///+ Format->Character ///'
+        printlog "get count of languages "
+        '///+ Format->Character "
         FormatCharacter
         sleep 1
         Kontext
-        '///+ switch to tabpage 'Font' ///'
+        '///+ switch to tabpage 'Font' "
         Messagebox.SetPage TabFont
         kontext "TabFont"
         sleep 1
-        '///+ get count of languages for Western/Asian/CTL fonts ///'
+        '///+ get count of languages for Western/Asian/CTL fonts "
         iWest    = LanguageWest.getItemCount
         iAsian   = LanguageEast.getItemCount
         iComplex = LanguageCTL.getItemCount
@@ -456,39 +469,39 @@ testcase tSetFormatCharacter
               Printlog "CTL font languages count         : " + iComplex
            endif
         endif
-	'///+ close dialog 'Character' with OK ///'
+	printlog "close dialog 'Character' with OK "
         TabFont.Ok
 
         WL_SD_TextEinfuegenDraw
         gMouseMove ( 1, 1, 100, 100 )
 
-        '///+ print the language counts into the first line of the document ///'
+        printlog "print the language counts into the first line of the document "
         hTypeKeys(" "+iWest+" "+iAsian+" "+iComplex+"<return>")
 
 
-        '/// set all languages to '[None]' ///'
-        '///+ Format->Character ///'
+        printlog "set all languages to '[None]' "
+        printlog "Format->Character "
         FormatCharacter
         kontext "TabFont"
-        '///+ select '[None]' (should be the first entry in every listbox) ///'
+        printlog "select '[None]' (should be the first entry in every listbox) "
         LanguageWest.select 1
         LanguageEast.select 1
         LanguageCTL.select 1
-        '///+ close dialog 'Character' with OK ///'
+        printlog "close dialog 'Character' with OK "
         TabFont.Ok
 
-        '/// print one line with language formated text for every language ///'
+        printlog "print one line with language formated text for every language "
         for i = 1 to iWest
-            '///+ Format->Character ///'
+            printlog "Format->Character "
             FormatCharacter
                 kontext "TabFont"
-                '///+ select the next language ///'
+                printlog "select the next language "
                 LanguageWest.select i
                 sTemp = LanguageWest.getItemText (i)
                 ListAppend(sLanguage(), sTemp)
-                '///+ close dialog 'Character' with OK ///'
+                printlog "close dialog 'Character' with OK "
             TabFont.Ok
-            '///+ type [return][number of language in list][Tab][Language name][Tab] ///'
+            printlog "type [return][number of language in list][Tab][Language name][Tab] "
             hTypeKeys(""+i+"<tab>"+sTemp+"<tab><return>")
         next i
 
@@ -528,7 +541,7 @@ testcase tSetFormatCharacter
             hTypeKeys(""+i+"<tab>"+sTemp+"<tab><return>")
         next i
 
-        '/// save the created document & the languages list if they don't exists ///'
+        printlog "save the created document & the languages list if they don't exists "
         hFileSaveAs (sFile)
         qaErrorLog "Created file. Please check it and then commit it! " + sTemp
         sTemp = convertPath(gTesttoolpath + "graphics\required\input\spellb_" + iSprache + ".txt")
@@ -536,29 +549,29 @@ testcase tSetFormatCharacter
             ListWrite(sLanguage(), sTemp,"utf8")
         endif
 
-        '/// restore the options ///'
-        '///+ Tools->Options ///'
+        printlog "restore the options "
+        printlog "Tools->Options "
         ToolsOptions
-        '///+ select tabpage 'Languages' from set 'Language Settings' ///'
+        printlog "select tabpage 'Languages' from set 'Language Settings' "
         hToolsOptions("LANGUAGESETTINGS","Languages")
         kontext "TabSprachen"
 
-        '///+ restore state of checkbox 'Asian languages support' ///'
-        '/// if the language is Asian, skip this part ///'
+        printlog "restore state of checkbox 'Asian languages support' "
+        printlog "if the language is Asian, skip this part "
         if bAsianLan = FALSE then
            if (bAsian <> TRUE) then
                Aktivieren.UNcheck
            endif
         endif
-        '///+ restore state of checkbox 'Complex text layout (CTL) support' ///'
+        printlog "restore state of checkbox 'Complex text layout (CTL) support' "
         if (bComplex <> TRUE) then
             ComplexScriptEnabled.UNcheck
         endif
-        '///+ close dialog 'Options' with OK ///'
+        printlog "close dialog 'Options' with OK "
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
 
-        '/// close application ///'
+        printlog "close application "
         Call hCloseDocument
     endif
     
@@ -586,29 +599,29 @@ testcase tGetFormatCharacter
        ExtensionString = "odg"
     end if
     
-    '/// open the english document with all languages ///'
+    printlog "open the english document with all languages "
     hDateiOeffnen (convertPath(gTesttoolpath + "graphics\required\input\spellb_" + iSprache + "."+ExtensionString)
     ListRead(sLanguageR(), convertPath(gTesttoolpath + "graphics\required\input\spellb_1.txt"),"utf8")
 
-    '/// activate all languages in options ///'
-    '///+ Tools->Options ///'
+    printlog "activate all languages in options "
+    printlog " Tools->Options "
     ToolsOptions
-    '///+ select tabpage 'Languages' from set 'Language Settings' ///'
+    printlog "select tabpage 'Languages' from set 'Language Settings' "
     hToolsOptions("LANGUAGESETTINGS","Languages")
     kontext "TabSprachen"
-    '///+ save state and check checkbox 'Asian languages support' ///'
+    printlog "save state and check checkbox 'Asian languages support' "
     bAsian = Aktivieren.isEnabled
     Aktivieren.check
-    '///+ save state and  check checkbox 'Complex text layout (CTL) support' ///'
+    printlog "save state and  check checkbox 'Complex text layout (CTL) support' "
     bComplex = ComplexScriptEnabled.isEnabled
     ComplexScriptEnabled.check
-    '///+ close dialog 'Options' with OK ///'
+    printlog "close dialog 'Options' with OK "
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
     sleep (1)
-    '/// get count of languages ///'
+    printlog "get count of languages "
     hTypeKeys("<tab><f2>")
-    '///+ first how many are in the reference document (printed in the first line)///'
+    printlog "first how many are in the reference document (printed in the first line)"
     hTypeKeys("<mod1 home><shift end>")
     sleep (1)
     editcopy
@@ -619,15 +632,15 @@ testcase tGetFormatCharacter
     iAsian(1) = mid(sTemp, iTemp+1, iTemp-i)
     iComplex(1) = right(sTemp, Len(sTemp) - i)
     sleep (1)
-    '///+ Format->Character ///'
+    printlog "Format->Character "
     FormatCharacter
     sleep 1
     Kontext
-    '///+ switch to tabpage 'Font' ///'
+    printlog "switch to tabpage 'Font' "
     Messagebox.SetPage TabFont
     kontext "TabFont"
     sleep 1
-    '///+ get count of languages for Western/Asian/CTL fonts ///'
+    printlog "get count of languages for Western/Asian/CTL fonts "
     iWest(2)    = LanguageWest.getItemCount
     iAsian(2)   = LanguageEast.getItemCount
     iComplex(2) = LanguageCTL.getItemCount
@@ -646,10 +659,10 @@ testcase tGetFormatCharacter
     else
         Printlog "CTL font languages count         : " + iComplex(2)
     endif
-    '///+ close dialog 'Character' with OK ///'
+    printlog "close dialog 'Character' with OK "
     TabFont.Ok
 
-    '/// write the language for every line in the current language ///'
+    printlog "write the language for every line in the current language "
     hTypeKeys("<mod1 home><down><home>")
     for i = 1 to iWest(2)
         FormatCharacter
@@ -659,7 +672,7 @@ testcase tGetFormatCharacter
             sTemp = LanguageWest.getSelText
             ListAppend(sLanguage(), sTemp)
         TabFont.Ok
-        '///+ type [end][number of language in list][Tab][Language name][down][home] ///'
+        printlog "type [end][number of language in list][Tab][Language name][down][home] "
         hTypeKeys("<end>"+iTemp+"<tab>"+sTemp+"<down><home>")
     next i
 
@@ -685,7 +698,7 @@ testcase tGetFormatCharacter
         hTypeKeys("<end>"+iTemp+"<tab>"+sTemp+"<down><home>")
     next i
 
-    '/// save the created document & the languages list ///'
+    printlog "save the created document & the languages list "
     sTemp = convertPath(gOfficePath + "user\work\spellb_" + iSprache)
     hFileSaveAsKill (sTemp)
     sTemp = convertPath(gOfficePath + "user\work\spellb_" + iSprache + ".txt")
@@ -709,6 +722,6 @@ testcase tGetFormatCharacter
         endif
     next i
 
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
 endcase 'tGetFormatCharacter
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index e2ee473df88f..70b387581329 100644
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -46,7 +46,7 @@ testcase tiEditUndo
     dim sTestfile as string
     dim sLocaltestfile as string
     
-    if ( gApplication = "IMPRESS" ) then
+    if (gApplication = "IMPRESS") then
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -70,6 +70,7 @@ testcase tiEditUndo
     Kontext "TabPositionAndSize"
     printlog "defining variable for original position of object"
     Ueber_Text_1=PositionX.GetText
+    printlog "Position X is: " & Ueber_Text_1
     printlog "Canceling dialog."
     TabPositionAndSize.Cancel
     sleep 2
@@ -95,13 +96,15 @@ testcase tiEditUndo
     Kontext
     Messagebox.SetPage TabPositionAndSize
     Kontext "TabPositionAndSize"
-    if PositionX=0 Then Warnlog "Command was not completely executed, and it could not be undone."
+    printlog "Position X is: " & PositionX.GetText
+    if (PositionX.GetText)=0 Then Warnlog "Command was not completely executed, and it could not be undone."
     TabPositionAndSize.Cancel
     sleep 2
     gMouseClick 60,60
     sleep 1
+
     printlog "Edit Undo for BringBackward"
-    EditUndo
+    EditUndo							
     Sleep 2
     gMouseClick 60,60
     sleep 1
@@ -113,7 +116,7 @@ testcase tiEditUndo
     Kontext "Toolbar"
     Auswahl.Click
     printlog "Again checking position using Position and Size dialog"
-    ContextPositionAndSize
+    ContextPositionAndSize					
     kontext
     Messagebox.SetPage TabPositionAndSize
     kontext "TabPositionAndSize"
@@ -135,7 +138,10 @@ testcase tiEditUndo
     endif
     Call hCloseDocument	
 
-endcase
+    printlog "Close document"
+    Call hCloseDocument						
+
+endcase 'tiEditUndo
 
 '-------------------------------------------------------------------------------
 testcase tiEditRedo
@@ -150,8 +156,9 @@ testcase tiEditRedo
     end if
     
     Datei$ = gTesttoolPath + "graphics\required\input\leer."+ExtensionString
-    
-    hFileOpen ConvertPath (Datei$)			'/// Open test document (leer.od?) ///'
+
+    printlog "Open test document (leer.od?)"
+    hFileOpen ConvertPath (Datei$)			
     sleep 3
     ' check if the document is writable
     if fIsDocumentWritable = false then
@@ -176,7 +183,8 @@ testcase tiEditRedo
     sleep 1
     hTypeKeys "<TAB>"
     sleep 1
-    ContextArrangeBringBackward					'/// move object behind other object ///'
+    printlog "move object behind other object"
+    ContextArrangeBringBackward					
     sleep 1
     gMouseClick 60,60
     sleep 1
@@ -185,25 +193,29 @@ testcase tiEditRedo
     ContextPositionAndSize
     sleep 1
     Kontext
-    Messagebox.SetPage TabPositionAndSize					'/// checking new position values ///'
+    printlog "checking new position values"
+    Messagebox.SetPage TabPositionAndSize					
     Kontext "TabPositionAndSize"
      if PositionX.GetText = Ueber_Text_1 Then Warnlog "  Nothing changed, so nothing can be undone"
     TabPositionAndSize.Cancel
     sleep 1
     gMouseClick 60,60
-    EditUndo							'/// Edit Undo///'
+    printlog "Edit Undo"
+    EditUndo							
     sleep 1
     hTypeKeys "<TAB>"
     sleep 1
     ContextPositionAndSize
     sleep 1
     kontext
-    Messagebox.SetPage TabPositionAndSize					'/// checking again position ///'
+    printlog "checking again position"
+    Messagebox.SetPage TabPositionAndSize					
     kontext "TabPositionAndSize"
     if PositionX.GetText <> Ueber_Text_1 Then Warnlog "  Undo didn't worked, so repeat last action wont work either"
     TabPositionAndSize.Cancel
     sleep 2
-    EditRedo							'/// Edit Redo ///'
+    printlog "Edit Redo"
+    EditRedo							
     sleep 2
     gMouseClick 60,60
     sleep 2
@@ -214,16 +226,18 @@ testcase tiEditRedo
     kontext
     Messagebox.SetPage TabPositionAndSize
     kontext "TabPositionAndSize"
-    if PositionX.GetText <> Ueber_Text_1 then			'/// checking position ///'
+    printlog "checking position"
+    if PositionX.GetText <> Ueber_Text_1 then			
       printlog "Action Undo repeated"
     else
       warnlog "Action Undo not repeated"
     end if
     TabPositionAndSize.OK
     sleep 1
-    call hCloseDocument						'/// close document ///'
+    printlog "close document"
+    call hCloseDocument						
     sleep 1
-endcase
+endcase 'tiEditRedo
 
 '-------------------------------------------------------------------------------
 testcase tiEditClipboard
@@ -231,61 +245,63 @@ testcase tiEditClipboard
     Dim Ueber_Text_4 as string
     dim sTemp as string
     
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     Call sSelectEmptyLayout
     sleep 1
     SetClipboard ""
-    '/// Create rectangle ///'
+    printlog "Create rectangle"
     Call hRechteckErstellen ( 65, 65, 80, 80 )
     sleep 1
-    '///+ RightClick onto rectangle///'
+    printlog "RightClick onto rectangle"
     gMouseClick 70,70
     sleep 1
-    Ueber_Text_4 = fGetPositionX()				'/// Get values for position variables ///'
+    printlog "Get values for position variables"
+    Ueber_Text_4 = fGetPositionX()				
     Sleep 1
-    '/// <b> Edit->Copy </b> ///'
+    printlog "<b> Edit->Copy </b>"
     EditCopy
-    '///+ Type Key [Deletee] ///'
+    '///+ Type Key [Deletee]"
     hTypeKeys "<DELETE>"
-    '///+ <i> Edit->Paste </i> ///'
+    '///+ <i> Edit->Paste </i>"
     EditPaste
     sleep 1
-    '///+   Edit->Select All ///'
+    '///+   Edit->Select All"
     EditSelectAll
     sTemp = fGetPositionX()
-    if LiberalMeasurement(sTemp, Ueber_Text_4) then			'/// TabPositionAndSize: comparing position with original position ///'
+    printlog "TabPositionAndSize: comparing position with original position"
+    if LiberalMeasurement(sTemp, Ueber_Text_4) then			
       printlog "OK   EditCopy and EditPaste"
     else
       warnlog "- Edit paste did not work; is: '" + sTemp + "' ; should: '" + Ueber_Text_4 + "'"
     end if
     sleep 1
-    '/// Type Keys [escape], + EditSelectAll (to deselect object and to select again) ///'
+    printlog "Type Keys [escape], + EditSelectAll (to deselect object and to select again)"
     hTypeKeys "<escape>"
     EditSelectAll
     sleep 2
-    '/// <b> Edit->Cut </b>///'
+    printlog "<b> Edit->Cut"
     EditCut
     sleep 1
     hTypeKeys "<TAB>"
     try
-      '///+ - Format->Position And Size -> HAS TO FAIL / IS NOT AVAILABLE !!! '///'
+      printlog "Format->Position And Size -> HAS TO FAIL / IS NOT AVAILABLE !!! "
       ContextPositionAndSize
          kontext
-         '///+ - select TabPage 'Position And Size' ///'
+         printlog "select TabPage 'Position And Size'"
          Messagebox.SetPage TabPositionAndSize
          Kontext "TabPositionAndSize"
          if TabPositionAndSize.NOTexists then
             warnlog "TabPositionAndSize isn't up ?!!"
          endif
-      '///+ - Ok dialog 'Position And Size' ///'
+        printlog "Ok dialog 'Position And Size'"
       TabPositionAndSize.Ok
       warnlog "TabPositionAndSize IS up :-( Doesn't have to be, because object should be deleted !!!"
     catch
       Printlog " - There is no object in the document anymore :-)"
     endcatch
     sleep 1
-    '///+ <i> Edit->Paste </i> ///'
+    printlog "Edit->Paste"
     EditPaste
     sleep 2
     sTemp = fGetPositionX()
@@ -295,9 +311,9 @@ testcase tiEditClipboard
       warnlog "- Edit paste did not work; is: '" + sTemp + "' ; should: '" + Ueber_Text_4 + "'"
     end if
     sleep 3
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tiEditClipboard
 
 '-------------------------------------------------------------------------------
 testcase tiEditPasteSpecial_HTML
@@ -305,7 +321,8 @@ testcase tiEditPasteSpecial_HTML
     dim Zaehler as integer
     Kontext "Standardbar"
     sleep 1
-    Call hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\frame1.htm")	'/// Load html document ///'
+    printlog "Load html document"
+    Call hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\frame1.htm")	
     sleep 5
     autoexecute=false
     Kontext "DocumentWriter"
@@ -314,49 +331,61 @@ testcase tiEditPasteSpecial_HTML
     autoexecute=true
     EditSelectAll
     sleep 3
-    EditCopy									'/// Copy selection ///'
+    printlog "Copy selection"
+    EditCopy									
     Sleep 2
-    FileClose									'/// Close document ///'
+    printlog "Close document"
+    FileClose									
     sleep 3
-    Call hNewDocument								'/// Create new Impress document ///'
+    printlog "Create new Impress document"
+    Call hNewDocument								
     sleep 1
-    EditPasteSpecial								'/// Edit paste special ///'
+    printlog "Edit paste special"
+    EditPasteSpecial								
     sleep 1
     Kontext "InhaltEinfuegen"
     For Zaehler = 1 to Auswahl.GetItemCount
        Auswahl.select Zaehler
        printlog Zaehler, ". Selection = ", Auswahl.GetSelText
     next Zaehler
-    
-    if Auswahl.GetItemCount <> 4 then						'/// Controlling number of possible formats ///'
+
+    printlog "Controlling number of possible formats"
+    if Auswahl.GetItemCount <> 4 then						
       warnlog "formats for inserting Html <> 4"
     else
       printlog "OK   4 formats for HTML-Document"
     end if
     
     sleep 3
-    InhaltEinfuegen.OK								'/// Paste clipboard content ///'
+    printlog "Paste clipboard content"
+    InhaltEinfuegen.OK								
     sleep 3
     try
-     EditCopy									'/// Copy object back into clipboard ///'
+    printlog "Copy object back into clipboard"
+     EditCopy									
     catch
      Warnlog "-  Nothing inserted into document"
     endcatch
     sleep 3
-    Call hCloseDocument  								'/// Close document ///'
+    printlog "Close document"
+    Call hCloseDocument  								
     sleep 3
-endcase
+endcase 'tiEditPasteSpecial_HTML
 
 '-------------------------------------------------------------------------------
 testcase tdEditPasteSpecial_Text
     
     printlog "Insert Text"
-    call hNewDocument                 '/// new document  ///'
-    SetClipboard "I am a cool test-text in the Clipboard"  '/// put text into clipboard ///'
-    EditPasteSpecial                  '/// edit paste special ///'
+    printlog "new document "
+    call hNewDocument
+    printlog "put text into clipboard"
+    SetClipboard "I am a cool test-text in the Clipboard"  
+    printlog "edit paste special"
+    EditPasteSpecial                  
     sleep 1
     Kontext "InhaltEinfuegen"
-    Auswahl.Select 1                  '/// select list entree 1 ///'
+    printlog "select list entree 1"
+    Auswahl.Select 1                  
     printlog "Selection = ", Auswahl.GetSelText
     sleep 1
     if Auswahl.GetItemCount <> 1 then
@@ -364,53 +393,64 @@ testcase tdEditPasteSpecial_Text
     else
       printlog "Format Text OK"
     end if
-    InhaltEinfuegen.OK                '/// close dialog ///'
+    printlog "close dialog"
+    InhaltEinfuegen.OK                
     sleep 1
-    
-    Call hCloseDocument                   '/// close document ///'
-endcase
+
+    printlog "close document"
+    Call hCloseDocument                   
+endcase 'tdEditPasteSpecial_Text
 
 '-------------------------------------------------------------------------------
 testcase tdEditPasteSpecial_Graphic
     
     dim Zaehler as integer
-    
-    call hNewDocument                  '/// ^new document  ///'
+
+    printlog "new document "
+    call hNewDocument                  
     printlog "Insert graphic file"
-    InsertGraphicsFromFile               '/// insert graphic (sample.bmp)///'
+    InsertGraphicsFromFile               
     
     Kontext "GrafikEinfuegenDlg"
-      Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
-      Oeffnen.Click
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
+    Oeffnen.Click
     sleep 1
-    EditSelectAll                     '/// select graphic ///'
-    EditCut                     '/// cut graphic ///'
-    EditPasteSpecial                  '/// edit paste special ///'
+    printlog "select graphic"
+    EditSelectAll
+    printlog "cut graphic"
+    EditCut
+    printlog "edit paste special"
+    EditPasteSpecial                  
     sleep 1
     Kontext "InhaltEinfuegen"
-    For Zaehler = 1 to Auswahl.GetItemCount         '/// get item count for Auswahl ///'
+    printlog "get item count for Auswahl"
+    For Zaehler = 1 to Auswahl.GetItemCount         
     Auswahl.select Zaehler
     printlog Zaehler, ". Selection = ", Auswahl.GetSelText
     next Zaehler
-    
-    if Auswahl.GetItemCount <> 4 then            '/// check if item count = 4 ///'
+
+    printlog "check if item count = 4"
+    if Auswahl.GetItemCount <> 4 then            
       warnlog "Format for insert graphic files should be 4, but is: " + Auswahl.GetItemCount
     else
       printlog "There are " + Auswahl.GetItemCount + " formats for graphic files"
     end if
-    InhaltEinfuegen.OK                '/// insert graphic from clipboard ///'
+    printlog "insert graphic from clipboard"
+    InhaltEinfuegen.OK                
     gMouseClick 90,90
     sleep 1
-    Call hCloseDocument                   '/// close document  ///'
-endcase
+    printlog "close document "
+    Call hCloseDocument                   
+endcase 'tdEditPasteSpecial_Graphic
 
 '-------------------------------------------------------------------------------
 testcase tdEditPasteSpecial_Circle
 
-   dim Zaehler as integer
- call hNewDocument                  '/// new document  ///'
+    dim Zaehler as integer
+    printlog "new document "
+    call hNewDocument
   sleep 5
-  printlog "Insert circle"                '/// create circle ///'
+  printlog "Insert circle"                
   Kontext "Toolbar"
   Ellipsen.Click
   sleep 3
@@ -418,28 +458,36 @@ testcase tdEditPasteSpecial_Circle
   sleep 1
   hTypeKeys "<escape>"
   sleep 2
-  EditSelectAll               '/// select circle ///'
+  printlog "select circle"
+  EditSelectAll               
   sleep 5
-  EditCut                     '/// cut circle ///'
+  printlog "cut circle"
+  EditCut                     
   sleep 1
-  EditPasteSpecial                  '/// edit paste special ///'
+  printlog "edit paste special"
+  EditPasteSpecial                  
   sleep 1
   Kontext "InhaltEinfuegen"
-  if EinfuegenAls.IsVisible Then EinfuegenAls.Check      '/// check "EinfuegenAls" ///'
-   For Zaehler = 1 to Auswahl.GetItemCount         '/// get item count for Auswahl ///'
+  printlog "check Insert as.."
+  if EinfuegenAls.IsVisible Then EinfuegenAls.Check
+  printlog "get item count for Auswahl"
+   For Zaehler = 1 to Auswahl.GetItemCount         
        Auswahl.select Zaehler
        printlog Zaehler, ". Selection = ", Auswahl.GetSelText
    next Zaehler
-   if Auswahl.GetItemCount <> 4 then            '/// check if item count = 4 ///'
+   printlog "check if item count = 4"
+   if Auswahl.GetItemCount <> 4 then            
      warnlog "Number of possible formats <> 4"
    else
      printlog "There are 4 formats for circle"
    end if
   sleep 1
-  InhaltEinfuegen.OK                '/// paste circle ///'
+  printlog "paste circle"
+  InhaltEinfuegen.OK                
   sleep 1
- Call hCloseDocument                   '/// close document  ///'
-endcase
+  printlog "close document "
+ Call hCloseDocument                   
+endcase 'tdEditPasteSpecial_Circle
 
 '-------------------------------------------------------------------------------
 testcase tiEditPasteSpecial
@@ -447,8 +495,8 @@ testcase tiEditPasteSpecial
   dim i as integer
   dim x as integer
 '   warnlog "TODOTBO: from draw, impress, math..."
-   '/// go into writer, type a text, select all, Edit->Cut, close writer ///'
-   '/// go into application to test, insert every format you can get from Edit->Paste->Special :-) ///'
+   printlog "go into writer, type a text, select all, Edit->Cut, close writer"
+   printlog "go into application to test, insert every format you can get from Edit->Paste->Special :-)"
    gApplication   = "WRITER"
    call hNewDocument
    kontext "DocumentWriter"
@@ -459,28 +507,29 @@ testcase tiEditPasteSpecial
    call hNewDocument
    sleep 1
 
- Printlog " get count of possibilities: "
-   EditPasteSpecial
-   sleep 1
-   Kontext "InhaltEinfuegen"
-   x = Auswahl.GetItemCount
-   for i = 1 to x
-      printlog " - " + i + " - " + Auswahl.GetItemText (i)
-   next i
-   InhaltEinfuegen.Cancel
+    Printlog " get count of possibilities: "
+    EditPasteSpecial
+    sleep 1
+    Kontext "InhaltEinfuegen"
+    x = Auswahl.GetItemCount
+    for i = 1 to x
+        printlog " - " + i + " - " + Auswahl.GetItemText (i)
+    next i
+    InhaltEinfuegen.Cancel
 
- Printlog " insert every possibility"
-   for i = 1 to x
-   Printlog " - processing number: "+i
-      EditPasteSpecial
-      sleep 1
-      Kontext "InhaltEinfuegen"
-      Auswahl.Select i
-      sleep 1
-      InhaltEinfuegen.OK
-      sleep 1
-   next i
-   Call hCloseDocument  '/// close document ///'
-endcase
+    Printlog " insert every possibility"
+    for i = 1 to x
+        Printlog " - processing number: "+i
+        EditPasteSpecial
+        sleep 1
+        Kontext "InhaltEinfuegen"
+        Auswahl.Select i
+        sleep 1
+        InhaltEinfuegen.OK
+        sleep 1
+    next i
+    printlog "close document"
+    Call hCloseDocument
+endcase 'tiEditPasteSpecial
 
 '-------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc
index 63eb77cd6134..d43cbacb02ec 100644
--- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc
@@ -48,7 +48,7 @@
 
 Sub Get_Position_Size_Attributes
 
-    Printlog "   Get_Position_Size_Attributes Starts"
+    Printlog "Get_Position_Size_Attributes Starts"
 
     FormatPositionAndSize
 
@@ -63,7 +63,7 @@ Sub Get_Position_Size_Attributes
     End Select
     sleep 1
 
-    ' /// Size-values ///'
+    printlog "Size-values"
     PositionWidth = Width.GetText
     PositionHeight = Height.GetText
 
@@ -86,7 +86,7 @@ Sub Get_Position_Size_Attributes
                 sleep 3
                 Printlog "   Get_Position_Size_Attributes Ends"
 
-end sub
+end sub 'Get_Position_Size_Attributes
 
 '-------------------------------------------------------------------------------
 sub Get_Colour_Attributes
@@ -100,7 +100,7 @@ sub Get_Colour_Attributes
     Kontext "TabArea"
 
 
-    ' /// Area ///'
+    printlog "Area"
     FillOptions.Select 2
     if FillOptions.GetSelIndex <> 2 then Errorlog "Couldnt click on 'Color' in FormatArea"
         AreaColourListValue = ColourList.GetSelText
@@ -273,7 +273,7 @@ sub Get_Colour_Attributes
                                     TabArea.Cancel
                                     printlog "   Get_Colour_Attributes ends"
 
-end sub
+end sub 'Get_Colour_Attributes
 
 '-------------------------------------------------------------------------------
 sub Check_Position_Size_Attributes
@@ -355,7 +355,7 @@ sub Check_Position_Size_Attributes
                                             sleep 3
                                             printlog "   Check_Position_Size_Attributes Ends"
 
-end sub
+end sub 'Check_Position_Size_Attributes
 
 '----------------------------------------------------------------------------------------------------
 sub Check_Text_Formatting
@@ -412,8 +412,10 @@ sub Check_Text_Formatting
                                 SetKontextApplication
                                 printlog "   Check_Text_Formatting Ends"
 
-end suB
-                                '----------------------------------------------------------------------------------------------------
+end sub 'Check_Text_Formatting
+
+'-------------------------------------------------------------------------------
+
 sub Check_Colors_Borders_Attributes
 
     printlog "   Check_Colors_Borders_Attributes Starts"
@@ -425,7 +427,7 @@ sub Check_Colors_Borders_Attributes
     Active.setpage TabArea
     Kontext "TabArea"
 
-    ' /// Area ///'
+    printlog "Area"
     FillOptions.Select 2
     if FillOptions.GetSelIndex <> 2 then Errorlog "Couldnt click on 'Color' in FormatArea"
 
@@ -608,7 +610,7 @@ sub Check_Colors_Borders_Attributes
                                                                                                                                                 Printlog "End of one application"
 
 
-end sub
+end sub 'Check_Colors_Borders_Attributes
    '---------------------------------- Set the Kontext to the current Application ----------------------------------'
 sub SetKontextApplication
 
@@ -633,7 +635,7 @@ sub SetKontextApplication
     end select
     sleep 1
 
-end sub
+end sub 'SetKontextApplication
 
 '------------------------- Part with "create new windows" ---------------------
 sub New_Draw
@@ -644,7 +646,7 @@ sub New_Draw
     Call hNewDocument
     SetKontextApplication
 
-end sub
+end sub 'New_Draw
 
 '-------------------------------------------------------------------------------
 sub New_Impress
@@ -656,7 +658,7 @@ sub New_Impress
     Call hNewDocument
     SetKontextApplication
 
-end sub
+end sub 'New_Impress
 
 '-------------------------------------------------------------------------------
 sub New_Calc
@@ -668,7 +670,7 @@ sub New_Calc
     Call hNewDocument
     SetKontextApplication
 
-end sub
+end sub 'New_Calc
 
 '-------------------------------------------------------------------------------
 sub New_Writer
@@ -680,7 +682,7 @@ sub New_Writer
     Call hNewDocument
     SetKontextApplication
 
-end sub
+end sub 'New_Writer
 
 '-------------------------------------------------------------------------------
 testcase Choose_Toapplication
@@ -709,6 +711,6 @@ testcase Choose_Toapplication
     Call hNewDocument
     SetKontextApplication
 
-endcase
+endcase 'Choose_Toapplication
 
 '--------------------------------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/g_crossfading.inc b/testautomation/graphics/optional/includes/global/g_crossfading.inc
index 0d7142b9ae46..e9df826aaff9 100644
--- a/testautomation/graphics/optional/includes/global/g_crossfading.inc
+++ b/testautomation/graphics/optional/includes/global/g_crossfading.inc
@@ -43,39 +43,47 @@ testcase tCrossfading
     dim CounterForX as integer
     dim anothercounter as integer
 
+    printlog "New Impress document"
     Call hNewDocument
-    Call sSelectEmptyLayout					                '/// New Impress document ///'
+    Call sSelectEmptyLayout					                
     gMouseClick 50,50
-   sleep 1
-    Call hRechteckErstellen ( 5, 5, 20, 30 )			'/// Create rectangle ///'
+    sleep 1
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )			
     gMouseClick 90,90
-    Call hRechteckErstellen ( 30, 30, 70, 70 )			'/// create rectangle ///'
-   sleep 1
-    EditSelectAll							            '/// Select all ///'
-   sleep 1
-    EditCrossFading                                     '/// Choose Edit / CrossFading ///'
+    printlog "create rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )			
+    sleep 1
+    printlog "Select all"
+    EditSelectAll							            
+    sleep 1
+    printlog "Choose Edit / CrossFading"
+    EditCrossFading                                     
     kontext "Ueberblenden"
-    X = Schritte.GetText									' /// Get counter-value and save it in X ///'
+    printlog "Get counter-value and save it in X"
+    X = Schritte.GetText									
     printlog "Steps before we start the test: " + X
     printlog "Schritte.GetText= " + Schritte.GetText
     
     Schritte.ToMin
     if Schritte.GetText <> "1" then qaerrorlog "Could not change the step-number to 1."
-
-    for I = 2 to 10										' /// How many steps do you want? ///'
+    printlog "How many steps do you want?"
+    for I = 2 to 10										
         Schritte.More 1
             if Schritte.GetText <> I then qaerrorlog "Could not change the step-number to" + I
                 Ueberblenden.OK
                 sleep 1
     try
-    FormatUngroupDraw							'/// open context menu and ungroup objects ///'
+    printlog "open context menu and ungroup objects"
+    FormatUngroupDraw							
     catch
     qaerrorlog "Could not ungroup objects"
     endcatch
     sleep 1
-    hTypeKeys "<TAB>"								'/// Should make the first object active ///'
+    printlog "Should make the first object active"
+    hTypeKeys "<TAB>"								
     
-    '/// Get position and dimensions of elements ///'
+    printlog "Get position and dimensions of elements"
       try
          ContextPositionAndSize
       catch
@@ -88,62 +96,76 @@ testcase tCrossfading
    if TabPositionAndSize.exists (5) then
          CounterForX=0
          CheckX=0
-         FirstX=PositionX.GetText								'/// Tet Dimensions of first object ///'
+         printlog "Tet Dimensions of first object"
+         FirstX=PositionX.GetText								
          TabPositionAndSize.OK
    else
       qaerrorlog "Couldn't switch tab page :-( "
    endif
 
+    printlog "How many objects we have on the screen"
+    anothercounter = I+2
 
-anothercounter = I+2										'/// How many objects we have on the screen ///'
-
-   for Y = 1 to anothercounter							'/// How many times we should step to (hopefully) get back to the first one ///'
+    printlog "How many times we should step to (hopefully) get back to the first one"
+   for Y = 1 to anothercounter							
       if Y > anothercounter then warnlog "Too many steps, something is wrong."
       try
-         hTypeKeys "<TAB>"								'/// Step to the next object ///'
+        printlog "Step to the next object"
+         hTypeKeys "<TAB>"								
       catch
          errolog "Could not step to the next object"
       endcatch
 '   Printlog "- Get position and dimensions of elements"
-      ContextPositionAndSize								    '/// Open Position and Size for this object ///'
+    printlog "Open Position and Size for this object"
+      ContextPositionAndSize								    
       sleep 1
       Kontext
       Active.SetPage TabPositionAndSize
          Kontext "TabPositionAndSize"
-         CheckX=PositionX.GetText								'/// Get Position X for this object ///'
+         printlog "Get Position X for this object"
+         CheckX=PositionX.GetText								
          sleep 1
       TabPositionAndSize.OK
    Kontext "DocumentDraw"
-      CounterForX=CounterForX+1 											'/// Up one on the object-counter ///'
-      if CheckX=FirstX then 									'/// Check if Position is the same as the first one ///'
+   printlog "Up one on the object-counter"
+      CounterForX=CounterForX+1
+      printlog "Check if Position is the same as the first one"
+      if CheckX=FirstX then 									
          if anothercounter = CounterForX then printlog "The first box is at: " + CheckX + " And we're now at " + FirstX + " = Correct steps between the objects, everything's fine."
-         printlog "We should have " + Y	+ " objects to go through."  		'/// Just here for debugging. - FHA
-'	  	 printlog "anothercounter= " + anothercounter   '/// Just here for debugging. - FHA
+         printlog "We should have " + Y	+ " objects to go through."  		
          printlog "Number of objects: " + anothercounter
          printlog ""
       endif
-   next Y														'/// End or go on with the checking-loop ///'
-
-      EditSelectAll							            		'/// Select all ///'
-      EditDelete                                          		'/// Delete all ///'
+      printlog "End or go on with the checking-loop"
+   next Y														
+   printlog "Select all"
+      EditSelectAll
+      printlog "Delete all"
+      EditDelete                                          		
    sleep 1
-      Call hRechteckErstellen ( 5, 5, 20, 30 )			  		'/// Create rectangle ///'
+   printlog "Create rectangle"
+Call hRechteckErstellen ( 5, 5, 20, 30 )	
     gMouseClick 90,90
-      Call hRechteckErstellen ( 30, 30, 70, 70 )		  		'/// Create rectangle ///'
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
     sleep 1
-      EditSelectAll							              		'/// Select all ///'
+    printlog "Select all"
+    EditSelectAll
     sleep 1
-      EditCrossFading                                     		'/// Choose Edit / CrossFading ///'
-      sleep 2
-        kontext "Ueberblenden"
+    printlog "Choose Edit / CrossFading"
+    EditCrossFading
+    sleep 2
+    kontext "Ueberblenden"
     next I
 
-    '/// And now we're gonna check if we can separate the object into it's parts ///'
-    '/// And check if the numbers of steps / objects is correct ///'
+    printlog "And now we're gonna check if we can separate the object into it's parts"
+    printlog "And check if the numbers of steps / objects is correct"
 
-    Schritte.ToMin                                            '/// Select minimum value for number of steps ///'
+    printlog "Select minimum value for number of steps"
+    Schritte.ToMin                                            
     for Z = 1 to X -1
-    Schritte.More                                             '/// Raise the value for number of steps with one ///'
+    printlog "Raise the value for number of steps with one"
+    Schritte.More                                             
     next Z
     printlog "Value has been restored to: " + Schritte.GetText
     printlog "X is now: " + X
@@ -151,101 +173,149 @@ anothercounter = I+2										'/// How many objects we have on the screen ///'
     Ueberblenden.OK
     sleep 1
     Kontext "DocumentDraw"
-    EditSelectAll							              '/// Select all ///'
-    EditDelete                                          '/// Delete all ///'
+    printlog "Select all"
+    EditSelectAll
+    printlog "Delete all"
+    EditDelete                                          
     sleep 1
-    Call hRechteckErstellen ( 5, 5, 20, 30 )			  '/// Create rectangle ///'
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )			  
     gMouseClick 90,90
-    Call hRechteckErstellen ( 30, 30, 70, 70 )		  '/// Create second rectangle ///'
-    EditSelectAll							              '/// Select all ///'
+    printlog "Create second rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
+    printlog "Select all"
+    EditSelectAll							              
     sleep 1
-    EditCrossFading                                     '/// Choose Edit / CrossFading ///'
+    printlog "Choose Edit / CrossFading"
+    EditCrossFading                                     
     Kontext "Ueberblenden"
     if Attributierung.IsChecked = TRUE then qaerrorlog "Attributierung /    was NOT unchecked."
-    GleicheOrientierung.UnCheck							  '/// Uncheck "same orienation" ///'   -????
-    Ueberblenden.OK									  '/// Close CrossFading-window with "OK" ///'
+    printlog "Uncheck same orienation"
+    GleicheOrientierung.UnCheck
+    printlog "Close CrossFading-window with OK"
+    Ueberblenden.OK									  
     sleep 1
     Kontext "DocumentDraw"
-    EditSelectAll							              '/// Select all ///'
-    EditDelete                                          '/// Delete all ///'
+    printlog "Select all"
+    EditSelectAll
+    printlog "Delete all"
+    EditDelete                                          
     sleep 1
-    Call hRechteckErstellen ( 5, 5, 20, 30 )			  '/// Create rectangle ///'
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )			  
     gMouseClick 90,90
-    Call hRechteckErstellen ( 30, 30, 70, 70 )		  '/// create rectangle ///'
-    EditSelectAll							              '/// Select all ///'
+    printlog "create rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
+    printlog "Select all"
+    EditSelectAll							              
     sleep 1
-    EditCrossFading                                     '/// Choose Edit / CrossFading ///'
+    printlog "Choose Edit / CrossFading"
+    EditCrossFading                                     
     Kontext "Ueberblenden"
     if GleicheOrientierung.IsChecked = TRUE then qaerrorlog "GleicheOrientierung /    was NOT unchecked."
-    Attributierung.Check							          '/// Check "Attributing" ///'  - ???
-    Ueberblenden.OK									  '/// Close CrossFading-window with "OK" ///'
+    printlog "Check Attributing"
+    Attributierung.Check
+    printlog "Close CrossFading-window with OK"
+    Ueberblenden.OK									  
     sleep 1
     Kontext "DocumentDraw"
-    EditSelectAll							              '/// Select all ///'
+    printlog "Select all"
+    EditSelectAll							              
     sleep 1
-    EditDelete                                          '/// Delete all ///'
+    printlog "Delete all"
+    EditDelete                                          
     sleep 1
-    Call hRechteckErstellen ( 5, 5, 20, 30 )			  '/// Create rectangle ///'
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )			  
     gMouseClick 90,90
-    Call hRechteckErstellen ( 30, 30, 70, 70 )		  '/// Create second rectangle ///'
-    EditSelectAll							              '/// Select all ///'
+    printlog "Create second rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
+    printlog "Select all"
+    EditSelectAll							              
     sleep 1
-    EditCrossFading                                     '/// Choose Edit / CrossFading ///'
+    printlog "Choose Edit / CrossFading"
+    EditCrossFading                                     
     Kontext "Ueberblenden"
     if Attributierung.IsChecked = FALSE then qaerrorlog "Attributierung /    was NOT checked again."
-    GleicheOrientierung.UnCheck							  '/// Check "same orientation" ///'   -????
+    printlog "Check same orientation"
+    GleicheOrientierung.UnCheck							  
     Ueberblenden.OK
     sleep 1
     Kontext "DocumentDraw"
-    EditSelectAll										  '/// Select all ///'
-    EditDelete										  '/// Delete all ///'
+    printlog "Select all"
+    printlog "Delete all"
+    EditSelectAll									
+    EditDelete										  
     sleep 1
-    Call hRechteckErstellen ( 5, 5, 20, 30 )			  '/// Create rectangle ///'
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )			  
     gMouseClick 90,90
-    Call hRechteckErstellen ( 30, 30, 70, 70 )		  '/// create rectangle ///'
-    EditSelectAll				   						  '/// Select all ///'
+    printlog "create rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
+    printlog "Select all"
+    EditSelectAll				   						  
     sleep 1
-    EditCrossFading                                     '/// Choose Edit / CrossFading ///'
+    printlog "Choose Edit / CrossFading"
+    EditCrossFading                                     
     Kontext "Ueberblenden"
-    if GleicheOrientierung.IsChecked = TRUE then qaerrorlog "GleicheOrientierung /    was NOT checked again."
-    GleicheOrientierung.Check							  '/// Check "same orientation" ///'   -????
-    Ueberblenden.OK									  '/// Close CrossFading-window with "OK" ///'
+    if GleicheOrientierung.IsChecked = TRUE then qaerrorlog "GleicheOrientierung /    was NOT checked again."    
+    printlog "Check same orientation"
+    GleicheOrientierung.Check
+    printlog "Close CrossFading-window with OK"
+    Ueberblenden.OK									  
     sleep 1
     Kontext "DocumentDraw"
-    EditSelectAll			  							  '/// Select all ///'
-    EditDelete										  '/// Delete all ///'
-    Call hRechteckErstellen ( 5, 5, 20, 30 )			  '/// Create rectangle ///'
+    printlog "Select all"
+    EditSelectAll
+    printlog "Delete all"
+    EditDelete
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )			  
     gMouseClick 90,90
-    Call hRechteckErstellen ( 30, 30, 70, 70 )		  '/// create rectangle ///'
-    EditSelectAll										  '/// Select all ///'
+    printlog "create rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
+    printlog "Select all"
+    EditSelectAll										  
     sleep 1
-    EditCrossFading                                     '/// Choose Edit / CrossFading ///'
+    printlog "Choose Edit / CrossFading"
+    EditCrossFading                                     
     Kontext "Ueberblenden"
     if GleicheOrientierung.IsChecked = FALSE then qaerrorlog "GleicheOrientierung /    was NOT checked again."
-    GleicheOrientierung.Check							  '/// Check "same orientation" ///'   -????
-    Ueberblenden.OK									  '/// Close CrossFading-window with "OK" ///'
+    printlog "Check same orientation"
+    GleicheOrientierung.Check
+    printlog "Close CrossFading-window with OK"
+    Ueberblenden.OK									  
     sleep 1
-    
-    Kontext "DocumentDraw"                                 '/// EditCrossFading should not be enabled if more than two objects is selected. ///'
-    EditSelectAll										  '/// Select all ///'
-    EditDelete                                          '/// Delete all ///'
+
+    printlog "EditCrossFading should not be enabled if more than two objects is selected."
+    Kontext "DocumentDraw"
+    printlog "Select all"
+    EditSelectAll
+    printlog "Delete all"
+    EditDelete                                          
     
     sleep 1
-    Call hRechteckErstellen ( 5, 5, 20, 30 )			  '/// Create rectangle ///'
+    printlog "Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )			  
     gMouseClick 90,90
-    Call hRechteckErstellen ( 30, 30, 70, 70 )		  '/// Create second rectangle ///'
+    printlog "Create second rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )		  
     gMouseClick 90,90
-    Call hRechteckErstellen ( 20, 20, 50, 50 )		  '/// Create third rectangle ///'
+    printlog "Create third rectangle"
+    Call hRechteckErstellen ( 20, 20, 50, 50 )		  
     sleep 1
-    EditSelectAll										  '/// Select all ///'
+    printlog "Select all"
+    EditSelectAll										  
     sleep 1
     try
-        EditCrossFading                                     '/// Choose Edit / CrossFading ///'
+        printlog "Choose Edit / CrossFading"
+        EditCrossFading                                     
         sleep 2
         If active = "Ueberblenden" then
         qaerrorlog "CrossFading should NOT be selectable since more than two objects is selected."
         kontext "Ueberblenden"
-        Ueberblenden.CANCEL								  '/// Close CrossFading-window with "CANCEL" ///'
+        printlog "Close CrossFading-window with CANCEL"
+        Ueberblenden.CANCEL								  
         endif
         sleep 2
         Kontext "DocumentDraw"
@@ -254,14 +324,17 @@ anothercounter = I+2										'/// How many objects we have on the screen ///'
     endcatch
 
     try
-       EditSelectAll										  '/// Select all ///'
-       EditDelete                                          '/// Delete all ///'
+        EditSelectAll
+        EditSelectAll
+        printlog "Delete all"
+        EditDelete
     catch
        warnlog "Could not select and delete all objects."
     endcatch
 
     printlog "End of test"
 
-    Call hCloseDocument						              '/// Close document ///'
+    printlog "Close document"
+    Call hCloseDocument						              
  
-endcase 'tCrossfading
+endcase 'tCrossfading
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc
index cb0a428d2f59..0860e8cb942a 100644
--- a/testautomation/graphics/optional/includes/global/g_demoguide.inc
+++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc
@@ -41,12 +41,10 @@ testcase t_Introduction
 
     gApplication   = "IMPRESS"
     
-    '///Open new presentation
     printlog "Open new presentation"
     Call hNewDocument
     Call sSelectEmptyLayout
     
-    '///Open the Gallery
     printlog "Open the Gallery"
     ToolsGallery
     Sleep (1)
@@ -55,7 +53,6 @@ testcase t_Introduction
         ToolsGallery
     end if
     
-    '///Choose computer theme and insert the third image
     printlog "Choose an item from the gallery"
     Gallerys.Select(2)
     View.TypeKeys "<HOME><RIGHT><RIGHT>"
@@ -65,7 +62,7 @@ testcase t_Introduction
     sleep 2
     MenuSelect(MenuGetItemID(1))   'Copy
     sleep 2
-    '///+ - Check that we really got a copy of the object ///'
+    printlog "Check that we really got a copy of the object "
     kontext "DocumentImpress"
     DocumentImpress.OpenContextMenu(true)
     sleep 2
@@ -93,15 +90,16 @@ testcase t_Introduction
     catch
         Warnlog "Insert graphic doesn't work"
     endcatch
-    
-    '///Resize object 
+    sleep 5
+
     printlog "Resize object"
     Kontext "DocumentImpress"
     gMouseClick (10, 10)
     sleep 1
     EditSelectAll
     sleep 1
-    ContextPositionAndSize                '/// Format-position and size
+    printlog "Format-position and size"
+    ContextPositionAndSize                
     Kontext
     Active.SetPage TabPositionAndSize
     Kontext "TabPositionAndSize"
@@ -111,7 +109,6 @@ testcase t_Introduction
     Width.SetText CStr((CInt(Width.GetText)) * 2)
     TabPositionAndSize.OK
     
-    '///Break object
     printlog "Break object"
     Kontext "DocumentImpress"
     gMouseClick (10, 10)
@@ -120,7 +117,6 @@ testcase t_Introduction
     sleep 1
     hOpenContextMenu  '(when the object is marked)
     hMenuSelectNr(13) 
-    '///    Select part of object and make it black
     printlog "Select part of object and make it black"
     DocumentImpress.TypeKeys "<SHIFT TAB>"
     FormatArea
@@ -131,14 +127,12 @@ testcase t_Introduction
     ColourList.Select 1
     TabArea.OK
     
-    '///Group the objects
     printlog "Group the object"
     kontext "DocumentImpress"
     DocumentImpress.TypeKeys "<MOD1 A>"
     hOpenContextMenu  '(when the object is marked)
     hMenuSelectNr(12)
 
-    '///Add Layout "Title Only"
     Printlog "Add Layout"
     kontext "Tasks"
     if (NOT Tasks.exists) then
@@ -146,19 +140,18 @@ testcase t_Introduction
         ViewTaskPane
     endif
 
-    ' enable all items in the task pane.
-    ' may be one item is not enabled due to a previous testrun
+    printlog "enable all items in the task pane"
+    printlog "may be one item is not enabled due to a previous testrun"
     dim i as integer
     for i = 1 to 5
     	printlog i
         View.OpenMenu
         if ( MenuIsItemChecked(MenuGetItemID(i)) ) then
-            ' do nothing the item is allready displayed
+            printlog "ok"
         else
             MenuSelect(MenuGetItemId(4))
         endif
         hMenuSelectNr(0)
-        'sleep(1)
     next
 
     View.OpenMenu
@@ -170,10 +163,8 @@ testcase t_Introduction
     View.OpenMenu
     MenuSelect(MenuGetItemId(5))
 
-
     LayoutsPreview.TypeKeys "<HOME> <DOWN> <DOWN> <RETURN>"
     sleep (5)
-    '///Add a background
     Printlog "Add background"
 
     Kontext "Tasks"
@@ -193,7 +184,6 @@ testcase t_Introduction
 	Tasks.TypeKeys "<MOD1 HOME>",true
     AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>"
     sleep (5)
-    '///Add a transition effect
     Printlog "Add a transition effect"
     Kontext "Tasks"
     sleep(5)
@@ -206,33 +196,33 @@ testcase t_Introduction
     View.OpenMenu
     MenuSelect(MenuGetItemID(4))
 
-    TransitionSound.GetItemCount   'needed for select
+    TransitionSound.GetItemCount  
     Sleep 1
     TransitionSound.Select 4
 
-    '///Close the document
     Printlog "Close the document"
     Call hCloseDocument
     
 endcase 't_Introduction
+
 '--------------------------------------------------------------------
+
 testcase t_Interoperability
 
     Dim sTemplatename as string
 
     gApplication   = "IMPRESS"
     
-    '///Open PowerPoint presentation
     printlog "Open PowerPoint presentation"
     hFileOpenLocally( gTesttoolPath + "graphics/required/input/dotNetOverview.ppt" )
 
-    'Save the name of the origin background (taken from last slide)
+    printlog "Save the name of the origin background (taken from last slide)"
         Kontext "DocumentImpress"
         DocumentImpress.TypeKeys "<END>"
         sleep (4)
         sTemplatename = DocumentImpress.StatusGetText (6)
-        printlog "    Background = " & sTemplatename     'Debugcode
-    
+        printlog "Background = " & sTemplatename     'Debugcode
+
     printlog "Choose a masterpage from right pane"
     
     Kontext "Tasks"
@@ -250,15 +240,14 @@ testcase t_Interoperability
     Kontext "AvailableForUsePreview"
     AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>"
     sleep (10)
-    printlog "    Verify that the background has changed"
+    printlog "Verify that the background has changed"
     Kontext "DocumentImpress"
-    printlog "    Background is " & DocumentImpress.StatusGetText (6)     'Debugcode
+    printlog "Background is " & DocumentImpress.StatusGetText (6)     'Debugcode
     if DocumentImpress.StatusGetText (6) = sTemplatename then
             warnlog "The background is not changed"
         else printlog "    Background has been changed"
     endif
     
-    '///Switch back to original background
     printlog "Switch back to original background"
     Kontext "Tasks"
     Kontext "AvailableForUsePreview"
@@ -270,7 +259,6 @@ testcase t_Interoperability
         else warnlog "The background is " & DocumentImpress.StatusGetText (6) & " but should be: " & sTemplatename
     endif
     
-    '///Resort slides
     printlog "Resort slides"
     Kontext "DocumentImpress"
     Kontext "Slides"
@@ -289,7 +277,7 @@ testcase t_Interoperability
      Printlog "    Verify that the slide was moved correctly"
      Kontext "Slides"
      sleep (5)
-
+   
      SlidesControl.TypeKeys "<SHIFT F10>"
      if hMenuFindSelect(27268, true, 3) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
@@ -300,12 +288,11 @@ testcase t_Interoperability
      if NameField.GetText <> ".NET Enterprise Federation" then
         Warnlog "Wrong slide found! Expected no 3, but found " + NameField.GetText + "."
      else
-        Printlog "    The slide was correctly moved"
+        Printlog "The slide was correctly moved"
      endif
      NameDlgPage.OK
      sleep 1
     
-    '///Switch views
     printlog "Switch views"
     ViewWorkspaceOutlineView
     sleep (2)
@@ -315,8 +302,8 @@ testcase t_Interoperability
         DocumentImpressOutlineView.TypeKeys "<Mod1 C>"
         sleep (5)
         if getclipboard() <> ".NET Enterprise Federation" then
-                warnlog "    Wrong selection in outlineview. Should be '.NET Enterprise', but is '" & getclipboard() +"'."
-            else printlog "    Switching to Outlineview was successfull"
+                warnlog "Wrong selection in outlineview. Should be '.NET Enterprise', but is '" & getclipboard() +"'."
+            else printlog "Switching to Outlineview was successfull"
         endif
     catch
         warnlog "Switching to Outlineview was not successfull"
@@ -331,7 +318,7 @@ testcase t_Interoperability
         MenuSelect(MenuGetItemID(3))   'Open Contextmenu Line
         Kontext "TabLinie"
         TabLinie.Cancel
-        printlog "    Switching to Notesview was successfull"
+        printlog "Switching to Notesview was successfull"
     catch
         warnlog "Switching to Notesview was not successfull"
     endcatch
@@ -340,7 +327,7 @@ testcase t_Interoperability
     try
         Kontext "DocumentImpressHandoutView"
         DocumentImpressHandoutView.TypeKeys "<TAB>"
-        printlog "    Switching to Handoutview was successfull"
+        printlog "Switching to Handoutview was successfull"
     catch
         warnlog "Switching to Handoutview was not successfull"
     endcatch
@@ -350,7 +337,7 @@ testcase t_Interoperability
     try
         Kontext "Slides"
         SlidesControl.TypeKeys "<TAB>"
-        printlog "    Switching to Slideview was successfull"
+        printlog "Switching to Slideview was successfull"
     catch
         warnlog "Switching to Slideview was not successfull"
     endcatch
@@ -360,12 +347,11 @@ testcase t_Interoperability
     try
         Kontext "DocumentImpress"
         DocumentImpress.TypeKeys "<TAB>"
-        printlog "    Switching back to Drawingview was successfull"
+        printlog "Switching back to Drawingview was successfull"
     catch
         warnlog "Switching to Drawingview was not successfull"
     endcatch
     
-    '///Travel through the presentation by left pane
     printlog "Travel through the presentation by left pane to slide 7"
     Kontext "DocumentImpress"
     DocumentImpress.TypeKeys "<HOME><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN>"
@@ -416,18 +402,16 @@ testcase t_DrawingEngine
     
     gApplication   = "DRAW"
     
-    '///Open a drawing
     printlog "Open a drawing"
     hFileOpen (Convertpath (gTesttoolPath + "graphics/required/input/Blueprint.odg"))
 
     Call fMakeDocumentWritable
 
-    '///Select grouped object and enter group
     printlog "Select group"
     Kontext "DocumentDraw"
     DocumentDraw.TypeKeys "<TAB><TAB>"
     sleep (5)
-    printlog "    Save position of group"
+    printlog "Save position of group"
     ContextPositionAndSize                'Format-position and size
     Kontext
     Active.SetPage TabPositionAndSize
@@ -440,7 +424,6 @@ testcase t_DrawingEngine
     FormatEditGroupDraw
     sleep 1
     
-    '///Select and move single object
     printlog "Select and move single object"
     printlog "    Select object"
     Kontext "DocumentDraw"
@@ -452,48 +435,46 @@ testcase t_DrawingEngine
     kontext "NameDlgObject"
     if NameField.GetText <> "Chair" then
             Warnlog "Wrong object selected!"
-        else Printlog "    The correct object is selected"
+        else Printlog "The correct object is selected"
     endif
     NameDlgObject.OK
     sleep 1
-    printlog "    Save position of group"
-    ContextPositionAndSize                'Format-position and size
+    printlog "Save position of group"
+    ContextPositionAndSize            
     Kontext
     Active.SetPage TabPositionAndSize
     Kontext "TabPositionAndSize"
     sObjectPosition = PositionY.GetText
-    printlog "    - ObjectPosition is " & sObjectPosition
+    printlog "ObjectPosition is " & sObjectPosition
     TabPositionAndSize.OK
-    printlog "    Move object"
+    printlog "Move object"
     Kontext "DocumentDraw"
     DocumentDraw.TypeKeys "<UP><UP><UP>"
     sleep (5)
-    printlog "    Verify that the object was moved"
-    ContextPositionAndSize                '/// Format-position and size
+    printlog "Verify that the object was moved"
+    ContextPositionAndSize                
     Kontext
     Active.SetPage TabPositionAndSize
     Kontext "TabPositionAndSize"
     if PositionY.GetText <> sObjectPosition then
-            printlog "    Single object was moved" 
+            printlog "Single object was moved" 
         else warnlog "The object has not been moved"
     endif
     TabPositionAndSize.OK
-    printlog "    Exit group"
+    printlog "Exit group"
     FormatExitGroupDraw
     Printlog "Verify that the group is still on position"
-    printlog "    Verify position"
     ContextPositionAndSize                'Format-position and size
     Kontext
     Active.SetPage TabPositionAndSize
     Kontext "TabPositionAndSize"
     if PositionY.GetText = sGroupPosition then
-            printlog "    Group is still on position"
+            printlog "Group is still on position"
         else warnlog "Group has moved from " & sGroupPosition & " to " & PositionY.GetText
     endif
     TabPositionAndSize.OK
     
-    '///Close document
     printlog "Close document"
     Call hCloseDocument
 
-endcase 't_DrawingEngine
+endcase 't_DrawingEngine
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc
index fdff948d0bfb..59cf4e3a404a 100644
--- a/testautomation/graphics/optional/includes/global/g_edit.inc
+++ b/testautomation/graphics/optional/includes/global/g_edit.inc
@@ -43,32 +43,41 @@
 '      Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
 
 testcase tEditDuplicate
- dim Ueber_Text_1
- dim Zaehler
 
- Call hNewDocument						'/// New Impress document ///'
-  Call hRechteckErstellen ( 5, 5, 20, 30 )			'/// Create rectangle ///'
-  EditSelectAll							'/// Select rectangle ///'
-  EditDuplicate							'/// Edit-duplicate ///'
-  Kontext "Duplizieren"
-  Ueber_Text_1 = AnzahlAnKopien.GetText
-  AnzahlAnKopien.SetText "50"					'/// Set number of copies to 50 ///'
-  Duplizieren.Cancel						'/// Cancel Edit Duplicate ///'
-  sleep 1
-   For Zaehler = 1 to 8
-       EditDuplicate						'/// Edit Duplicate ///'
-       sleep 1
-       Kontext "Duplizieren"
-       AnzahlAnKopien.SetText "30"				'/// Number of copies = 30 ///'
+    dim Ueber_Text_1
+    dim Zaehler
 
-       Select Case Zaehler					'/// Setting values for axis and angles ///'
-          Case 1:	XAchse.SetText "0,0"
+    printlog " New Impress document"
+    Call hNewDocument
+    printlog " Create rectangle"
+    Call hRechteckErstellen ( 5, 5, 20, 30 )
+    printlog " Select rectangle"
+    EditSelectAll
+    printlog " Edit-duplicate"
+    EditDuplicate
+    Kontext "Duplizieren"
+    Ueber_Text_1 = AnzahlAnKopien.GetText
+    printlog " Set number of copies to 50"
+    AnzahlAnKopien.SetText "50"
+    printlog " Cancel Edit Duplicate"
+    Duplizieren.Cancel
+    sleep 1
+    For Zaehler = 1 to 8
+        printlog " Edit Duplicate"
+        EditDuplicate
+        sleep 1
+        Kontext "Duplizieren"
+        printlog " Number of copies = 30"
+        AnzahlAnKopien.SetText "30"
+        printlog " Setting values for axis and angles"
+        Select Case Zaehler
+            Case 1:	XAchse.SetText "0,0"
             YAchse.SetText "0,45"
             Hoehe.SetText  "-0,1"
             Breite.SetText "-0,1"
             Drehwinkel.SetText "3"
             Anfang.Select Int((Anfang.GetItemCount * Rnd)+1)
-          Case 2,6:	XAchse.SetText "0,6"
+            Case 2,6:	XAchse.SetText "0,6"
             YAchse.SetText "0,0"
             Hoehe.SetText  "0,15"
             Breite.SetText "0,01"
@@ -78,26 +87,28 @@ testcase tEditDuplicate
             Hoehe.SetText  "-0,1"
             Breite.SetText "0,06"
             Drehwinkel.SetText "11"
-          Case 4,8:	XAchse.SetText "-0,6"
+            Case 4,8:	XAchse.SetText "-0,6"
             YAchse.SetText "0,0"
             Hoehe.SetText  "0,05"
             Breite.SetText "-0,08"
             Drehwinkel.SetText "347"
-          Case 5:	XAchse.SetText "0,1"
+            Case 5:	XAchse.SetText "0,1"
             YAchse.SetText "0,48"
             Hoehe.SetText  "-0,05"
             Breite.SetText "-0,05"
             Drehwinkel.SetText "355"
-    End Select
-    Ende.Select Int((Ende.GetItemCount * Rnd)+1)
-    Duplizieren.OK						'/// Execute Duplicate ///'
-    sleep 1
-   Next Zaehler
-  sleep 2
- Call hCloseDocument						'/// Close document ///'
+        End Select
+        Ende.Select Int((Ende.GetItemCount * Rnd)+1)
+        printlog " Execute Duplicate"
+        Duplizieren.OK
+        sleep 1
+    Next Zaehler
+    sleep 2
+    printlog " Close document"
+    Call hCloseDocument
  
 endcase 'tEditDuplicate
-'---------------------------------------------------------
+'-------------------------------------------------------------------------------
 testcase tEditFields
 
     Call hNewDocument
@@ -148,68 +159,85 @@ endcase 'tEditFields
 '--------------------------------------------------------
 testcase tEditDeleteSlide
 
- dim Ueber_Text_1 as string
- dim Ueber_Text_2 as string
- dim Ueber_Text_3 as string
-  Call hNewDocument						'/// New impress document ///'
-  sleep 3
-  Call hRechteckErstellen ( 30, 30, 70, 70 )			'/// create rectangle ///'
-  sleep 1
-  ContextPositionAndSize					'/// open Position and Size dialog ///'
-  kontext
-  Messagebox.SetPage TabPositionAndSize
-  kontext "TabPositionAndSize"
-  Ueber_Text_1 = PositionX.GetText				'/// get position values for rectangle ///'
-  TabPositionAndSize.OK
-  InsertSlide							'/// insert slide ///'
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  Call hRechteckErstellen ( 40, 40, 60, 60 )			'/// create rectangle ///'
-  sleep 1
-  EditDeleteSlide						'/// Delete slide ///'
-  sleep 1
-  Ueber_Text_2 = "OK   Page was closed"
-  Ueber_Text_3 = "Page was not closed"
-  call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3)					'/// compare position of rectange ///'
-  sleep 1
- Call hCloseDocument						'/// close document ///'
+    dim Ueber_Text_1 as string
+    dim Ueber_Text_2 as string
+    dim Ueber_Text_3 as string
+
+    printlog " New impress document"
+    Call hNewDocument
+    sleep 3
+    printlog " create rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
+    sleep 1
+    printlog " open Position and Size dialog"
+    ContextPositionAndSize
+    kontext
+    Messagebox.SetPage TabPositionAndSize
+    kontext "TabPositionAndSize"
+    printlog " get position values for rectangle"
+    Ueber_Text_1 = PositionX.GetText
+    TabPositionAndSize.OK
+    printlog " insert slide"
+    InsertSlide
+    sleep 2
+    hTypekeys "<Pagedown>"
+    sleep 2
+    printlog " create rectangle"
+    Call hRechteckErstellen ( 40, 40, 60, 60 )
+    sleep 1
+    printlog " Delete slide"
+    EditDeleteSlide
+    sleep 1
+    Ueber_Text_2 = "OK   Page was closed"
+    Ueber_Text_3 = "Page was not closed"
+    printlog " compare position of rectange"
+    call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3)
+    sleep 1
+    printlog " close document"
+    Call hCloseDocument
  
 endcase 'tEditDeleteSlide
 '--------------------------------------------------------
 testcase tEditLinks
 
- Call  hNewDocument						'/// New document ///'
-  InsertGraphicsFromFile					'/// insert graphic (sample.bmp) ///'
-  Kontext "GrafikEinfuegenDlg"
-  Link.Check							'/// check link ///'
-      Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
-      Oeffnen.Click
-  sleep 3
-  EditLinksDraw					'/// edit links ///'
-  Kontext "VerknuepfungenBearbeiten"
-  Aktualisieren.Click						'/// refresh ///'
-  sleep 1
-  'Aendern							'kann man noch den Dialog aufrufen...
-  Loesen.Click
-  sleep 1
-  Kontext
-  Messagebox.Yes
-  VerknuepfungenBearbeiten.Close				'/// close dialog ///'
-  sleep 1
-  try
-    EditLinksDraw				'/// check if last changes remain in the dialog ///'
+    printlog " New document"
+    Call  hNewDocument
+    printlog " insert graphic (sample.bmp)"
+    InsertGraphicsFromFile
+    Kontext "GrafikEinfuegenDlg"
+    printlog " check link"
+    Link.Check
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
+    Oeffnen.Click
+    sleep 3
+    printlog " edit links"
+    EditLinksDraw
     Kontext "VerknuepfungenBearbeiten"
+    printlog " refresh"
+    Aktualisieren.Click
+    sleep 1
     Loesen.Click
     sleep 1
     Kontext
     Messagebox.Yes
+    printlog " close dialog"
     VerknuepfungenBearbeiten.Close
-    warnlog "Break link does not work"
+    sleep 1
+    try
+        printlog " check if last changes remain in the dialog"
+        EditLinksDraw
+        Kontext "VerknuepfungenBearbeiten"
+        Loesen.Click
+        sleep 1
+        Kontext
+        Messagebox.Yes
+        VerknuepfungenBearbeiten.Close
+        warnlog "Break link does not work"
   catch
-    printlog "OK   Link broken"
+        printlog "OK   Link broken"
   endcatch
- Call hCloseDocument						'/// close document ///'
+    printlog " close document"
+    Call hCloseDocument
  
 endcase 'tEditLinks
 '---------------------------------------------------------
@@ -218,77 +246,87 @@ testcase tdEditDeleteLayer
  dim Ueber_Text_1 as string
  dim Ueber_Text_2 as string
  dim Ueber_Text_3 as string
- Call hNewDocument                     '/// new document ///'
-  sleep 2
-  Call hRechteckErstellen ( 30, 30, 70, 70 )          '/// create rectangle ///'
-  sleep 1
-'/// View->Layer ///'
-   ViewLayer
-  ContextPositionAndSize                  '/// get position values for rectangle ///'
-  kontext
-  active.SetPage TabPositionAndSize
-  kontext "TabPositionAndSize"
-  Ueber_Text_1 = PositionX.GetText
-  TabPositionAndSize.OK
-  InsertLayer                             '/// insert layer ///'
-  Kontext "EbeneEinfuegenDlg"
-  EbeneEinfuegenDlg.OK
-  Call hRechteckErstellen ( 10, 40, 90, 60 )          '/// create rectangle on created layer ///'
-  sleep 1
-  EditDeleteLayer                   '/// delete layer ///'
-  sleep 1
-  Kontext
-  Active.Yes
-  sleep 1
-  Ueber_Text_2 = "OK   Layer was deleted"            '/// compare position of selected rectangle with position of created rectangle in deteted layer ///'
-  Ueber_Text_3 = "Layer was not deleted"
-  Call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3)
-  sleep 1
- Call hCloseDocument                   '/// close document ///'
+
+    printlog " new document"
+    Call hNewDocument
+    sleep 2
+    printlog " create rectangle"
+    Call hRechteckErstellen ( 30, 30, 70, 70 )
+    sleep 1
+    printlog " View->Layer"
+    ViewLayer
+    printlog " get position values for rectangle"
+    ContextPositionAndSize
+    kontext
+    active.SetPage TabPositionAndSize
+    kontext "TabPositionAndSize"
+    Ueber_Text_1 = PositionX.GetText
+    TabPositionAndSize.OK
+    printlog " insert layer"
+    InsertLayer
+    Kontext "EbeneEinfuegenDlg"
+    EbeneEinfuegenDlg.OK
+    printlog " create rectangle on created layer"
+    Call hRechteckErstellen ( 10, 40, 90, 60 )
+    sleep 1
+    printlog " delete layer"
+    EditDeleteLayer
+    sleep 1
+    Kontext
+    Active.Yes
+    sleep 1
+    Ueber_Text_2 = "OK   Layer was deleted"
+    Ueber_Text_3 = "Layer was not deleted"
+    printlog " compare position of selected rectangle with position of created rectangle in deteted layer"
+    Call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3)
+    sleep 1
+    printlog " close document"
+    Call hCloseDocument
  
 endcase 'tdEditDeleteLayer
 '--------------------------------------------------------
 testcase tEditObjectEdit
 
- Dim Schrieb  as string
-
-  Schrieb = gOLEWriter
-  if Schrieb = "" then
-      warnlog " the OLE is not defined :-((( gOLEWriter: " + iSprache
-  else
+    Dim Schrieb  as string
 
-      Call hNewDocument
-      call sSelectEmptyLayout
-      sleep 1               '/// new document ///'
-      InsertObjectOLEObject             '/// insert writer ole object ///'
-      Kontext "OLEObjektEinfuegen"
-      sleep 3
-      if ObjektTyp.GetItemCount = 0 Then
-         Warnlog "- No available Ole-entry in the list, maybe an error in the Install.ini?"
-         sleep 1
-         OleObjektEinfuegen.Cancel
-         sleep 1
-       else
-
-          ObjektTyp.Select Schrieb
-          sleep 1
-          OLEObjektEinfuegen.OK
-          sleep 3                                 ' Changed from Sleep 1 to Sleep 3
-          gMouseMove  10,10,90,90
-          sleep 1
-          EditSelectAll
+    Schrieb = gOLEWriter
+    if Schrieb = "" then
+        warnlog " the OLE is not defined :-((( gOLEWriter: " + iSprache
+    else
+        printlog " new document"
+        Call hNewDocument
+        call sSelectEmptyLayout
+        sleep 1
+        printlog " insert writer ole object"
+        InsertObjectOLEObject             
+        Kontext "OLEObjektEinfuegen"
+        sleep 3
+        if ObjektTyp.GetItemCount = 0 Then
+            Warnlog "- No available Ole-entry in the list, maybe an error in the Install.ini?"
+            sleep 1
+            OleObjektEinfuegen.Cancel
+            sleep 1
+        else
+            ObjektTyp.Select Schrieb
+            sleep 1
+            OLEObjektEinfuegen.OK
+            sleep 3
+            gMouseMove  10,10,90,90
+            sleep 1
+            EditSelectAll
 
-          try
-             EditObjectEdit      'keine ID      '/// try edit-objects ///'
-             sleep 2
-          catch
-             Warnlog "-  The EditObjectEdit did not work"
-          endcatch
+            try
+                EditObjectEdit
+                sleep 2
+            catch
+                Warnlog "-  The EditObjectEdit did not work"
+            endcatch
 
 
-          gMouseClick 90,90
+            gMouseClick 90,90
         end if
-      sleep 1
-     Call hCloseDocument                     '/// close document ///'
-  endif
-endcase 'tEditObjectEdit
+        sleep 1
+        printlog " close document"
+        Call hCloseDocument
+    endif
+endcase 'tEditObjectEdit
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc
index b96099be71ab..3b9fc48ae10f 100644
--- a/testautomation/graphics/optional/includes/global/g_find_replace.inc
+++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc
@@ -36,21 +36,21 @@
 '*
 '\**********************************************************************************
 testcase tiEditSearchAndReplace
+    printlog "This test tests the 'Search and Replace' -dialogue."
     qaerrorlog "#i115121# Find and replace: wrong replacement"
     goto endsub
-   '/// This test tests the 'Search and Replace' -dialogue. ///'
    Dim sFile  'as string
    Dim sExpression(2) as string  ' Expression to look for: ... Replace with
    dim sExt as string
 
-   Select Case Ucase(gApplication)
-       case "DRAW"      : sExt = ".odg"
-       case "IMPRESS"   : sExt = ".odp"
-   end select
+    Select Case Ucase(gApplication)
+        case "DRAW"      : sExt = ".odg"
+        case "IMPRESS"   : sExt = ".odp"
+    end select
 
-  'First we need some errornes words to replace. (sExpression)
-  'sExpression(1) has to be 3 times in the document
-     select case iSprache
+    printlog "First we need some errornes words to replace. (sExpression)"
+    printlog "sExpression(1) has to be 3 times in the document"
+    select case iSprache
          case 01 : sExpression(1) = "Alle" : sExpression(2) = "Allz"
          case 03 : sExpression(1) = "empreza" : sExpression(2) = "Emperor"       ' Portuguese
          case 07 : qaerrorlog "No files for Russian yet, will use english instead."
@@ -93,9 +93,9 @@ testcase tiEditSearchAndReplace
     else
         Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt)
     endif
-    ' 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
@@ -110,24 +110,28 @@ testcase tiEditSearchAndReplace
         Messagebox.OK
     end if
     sleep 2
-    hTypeKeys "<MOD1 HOME>"     '/// Select the text ///'
+    printlog "Select the text"
+    hTypeKeys "<MOD1 HOME>"     
 
- '/// Edit-Find & Replace I///'
+    printlog "Edit-Find & Replace"
     EditSearchAndReplace
     sleep 1
     Kontext "FindAndReplace"
-    '/// Clap the 'more options'-part open ///'
+    printlog "Clap the 'more options'-part open"
     More.Click
-    '/// verify, that search is done without 'similarity search' !!! ///'
+    printlog "verify, that search is done without 'similarity search' !!!"
     if SimilaritySearch.IsChecked = TRUE then
         SimilaritySearch.UnCheck
         warnlog "'Similar search' checkbox was enabled! It shouldn't be the default!"
     end if
-    SearchFor.SetText sExpression(1)                               '/// set Search text ///'
-    ReplaceWith.SetText sExpression(2)                            '/// set Replace text///'
+    printlog "set Search text"
+    SearchFor.SetText sExpression(1)
+    printlog "set Replace text"
+    ReplaceWith.SetText sExpression(2)                            
 
- '/// Word has to be there ONLY three times ///'
-    SearchNow.Click                                        '/// 1st search for text ///'
+    printlog "Word has to be there ONLY three times"
+    printlog "1st search for text"
+    SearchNow.Click                                        
     Kontext "Messagebox"
         if Messagebox.Exists(2) then
             Printlog Messagebox.GetText
@@ -136,7 +140,8 @@ testcase tiEditSearchAndReplace
     sleep 1
     Kontext "FindAndReplace"
 
-    SearchNow.Click                   '/// 2nd search for text ///'
+    printlog "2nd search for text"
+    SearchNow.Click                   
     Kontext "Messagebox"
         if Messagebox.Exists(2) then
             Printlog Messagebox.GetText
@@ -145,7 +150,8 @@ testcase tiEditSearchAndReplace
     sleep 1
     Kontext "FindAndReplace"
 
-    SearchNow.Click                   '/// 3th search for text///'
+    printlog "3th search for text"
+    SearchNow.Click                   
     Kontext "Messagebox"
         if Messagebox.Exists(2) then
             Printlog Messagebox.GetText
@@ -153,15 +159,16 @@ testcase tiEditSearchAndReplace
         end if
     sleep 1
     Kontext "FindAndReplace"
-
-    SearchNow.Click                   '/// 4th search for text; but it is no more available!///'
+    printlog "4th search for text; but it is no more available!"
+    SearchNow.Click                   
     sleep 2
     kontext "Messagebox"
     if Messagebox.Exists Then
         Printlog "- The word was found 3 times: '" + messagebox.gettext + "'"
         Messagebox.OK
     else
-        SearchNow.Click               '/// 5th search for word 1///'
+        printlog "5th search for word 1"
+        SearchNow.Click               
         kontext
         if Messagebox.Exists (5) Then
             Printlog "?: "+Messagebox.gettext
@@ -171,7 +178,7 @@ testcase tiEditSearchAndReplace
         Warnlog "- No MsgBox appeared: 'changed'"
     end if
 
- '/// Replace all ///'
+ printlog "Replace all"
     Kontext "FindAndReplace"
     sleep 1
     ReplaceAll.Click
@@ -185,7 +192,8 @@ testcase tiEditSearchAndReplace
     end if
     Kontext "FindAndReplace"
     sleep 2
-    SearchNow.Click                                        '/// Search for word 1 to check if all words are replaced ///'
+    printlog "Search for word 1 to check if all words are replaced"
+    SearchNow.Click                                        
     Kontext "Messagebox"
     if Not Messagebox.Exists then
         Warnlog "  Not all words are replaced (Replace All)"
@@ -197,17 +205,20 @@ testcase tiEditSearchAndReplace
     FindAndReplace.Close
     sleep 3
 
- '/// Edit-Find & Replace II ///'
+ printlog "Edit-Find & Replace II"
     gMouseClick 50,50
     sleep 1
     hTypeKeys "<MOD1 HOME>"
     EditSearchAndReplace
     sleep 1
     Kontext "FindAndReplace"
-    SearchFor.SetText sExpression(2)           '/// Search for word 2 ///'
-    ReplaceWith.SetText sExpression(1)       '/// Replace with word 1 ///'
+    printlog "Search for word 2"
+    SearchFor.SetText sExpression(2)
+    printlog "Replace with word 1"
+    ReplaceWith.SetText sExpression(1)       
 
-    ReplaceBtn.Click                      '/// Replace 1 ///'
+    printlog "Replace 1"
+    ReplaceBtn.Click                      
     Kontext "Messagebox"
     if Messagebox.Exists(4) Then
         Kontext "Messagebox"
@@ -219,7 +230,8 @@ testcase tiEditSearchAndReplace
     Kontext "FindAndReplace"
     sleep 1
 
-    SearchNow.Click                       '/// 2nd search for word 2 ///'
+    printlog "2nd search for word 2"
+    SearchNow.Click                       
     Kontext "Messagebox"
     if Messagebox.Exists(2) Then
         Warnlog "  All words got replaced, but only the 1st should have been"
@@ -230,7 +242,7 @@ testcase tiEditSearchAndReplace
         Printlog "  Word replaced"
     end if
 
- '/// Replace all ///'
+ printlog "Replace all"
     Kontext "FindAndReplace"
     ReplaceAll.Click
     kontext "Messagebox"
@@ -240,7 +252,7 @@ testcase tiEditSearchAndReplace
         Printlog "- No messagebox after replace all"
     end if
 
- '/// Search for word 2 to check if all are replaced ///'
+ printlog "Search for word 2 to check if all are replaced"
     Kontext "FindAndReplace"
     SearchNow.Click
     kontext "Messagebox"
@@ -255,21 +267,23 @@ testcase tiEditSearchAndReplace
     More.Click
     FindAndReplace.Close
     sleep 2
-  '/// Close document ///'
+  printlog "Close document"
     Call hCloseDocument
     
 endcase 'tiEditSearchAndReplace
+
 '--------------------------------------------------------
+
 testcase tiEditSearchAndReplaceBUGS
 
-'/// inspired by bugs: 101974, 101975, 101976 ///'
+printlog "inspired by bugs: 101974, 101975, 101976"
    dim i as integer
    dim bTemp as boolean
 
-   '/// open application ///'
+   printlog "open application"
    Call hNewDocument
    sleep 3
-   '/// Edit->Search and Replace ///'
+   printlog "Edit->Search and Replace"
    EditSearchAndReplace
    Kontext "FindAndReplace"
    if FindAndReplace.Exists (5) then
@@ -278,7 +292,7 @@ testcase tiEditSearchAndReplaceBUGS
       Warnlog "Dialog for Search&Replace could NOT be opened :-("
    endif
 
-   '/// for al 5 views in 'View->Workspace->...' do:  ///'
+   printlog "for al 5 views in 'View->Workspace->...' do: "
    for i = 1 to 6
       Printlog "- " + i + " View->Workspace->... ------------------------------------------------------"
       try
@@ -317,7 +331,7 @@ testcase tiEditSearchAndReplaceBUGS
       endcatch
       sleep 5
       Kontext "FindAndReplace"
-      '///+ if not already open, open. edit->search and replace ///'
+      printlog "if not already open, open. edit->search and replace"
       if (FindAndReplace.exists <> TRUE) then
          try
             EditSearchAndReplace
@@ -332,13 +346,13 @@ testcase tiEditSearchAndReplaceBUGS
          endif
       else
          Kontext "FindAndReplace"
-         '///+ set text to look for to "a" ///'
+            printlog "set text to look for to a"
          SearchFor.SetText "a"
-         Printlog "'///+ click button 'find' ///'"
+         Printlog " click button 'find'"
          SearchNow.Click
          sleep 5
          kontext
-         '///+ if active exists 'wrap/not found...' say OK ///'
+         printlog "if active exists 'wrap/not found...' say OK"
          if active.exists(5) then
             Printlog "Active: '" + active.GetText + "'"
             try
@@ -359,7 +373,7 @@ testcase tiEditSearchAndReplaceBUGS
    next i
    Kontext "FindAndReplace"
    FindAndReplace.cancel
-   '/// close application ///'
+   printlog "close application"
    Call hCloseDocument
    
 endcase 'tiEditSearchAndReplaceBUGS
diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc
index 8cf37d5432a3..dbd8d6fe8a43 100644
--- a/testautomation/graphics/optional/includes/global/g_format.inc
+++ b/testautomation/graphics/optional/includes/global/g_format.inc
@@ -365,8 +365,9 @@ testcase tdFormatConnector
 
     WaitSlot (1000)
     hTypeKeys "<SHIFT F10>"   'OpenContextMenu(true)
-    sleep (3)
+    sleep (2)
     hMenuSelectNr(2)  ' Connector
+    sleep (1)
     Kontext "Verbinder"
         Typ.Select 2 ' the one with 2 from 3 posibilities to set a value...
    Sleep (1)
diff --git a/testautomation/graphics/optional/includes/global/g_group.inc b/testautomation/graphics/optional/includes/global/g_group.inc
index a11b809355ce..7784303e207a 100644
--- a/testautomation/graphics/optional/includes/global/g_group.inc
+++ b/testautomation/graphics/optional/includes/global/g_group.inc
@@ -34,74 +34,87 @@
 '\********************************************************************
 
 testcase tiGruppierung
- Dim PosX 		 'Variable fuer PositionX
+    Dim PosX 'Variable for PositionX
 
+    printlog "new document"
     Call hNewDocument
-    Call sSelectEmptyLayout								   '/// new document  ///'
-  sleep 3
-  Kontext "DocumentImpress"
-  sleep 2
-  hRechteckErstellen (20,20,40,40)				   '/// create rectangle  ///'
-  sleep 1
-  hRechteckErstellen (60,60,70,10)				   '/// create 2nd rectangle ///'
-  sleep 1
-  hRechteckErstellen (50,90,70,40)				   '/// create 3rd rectangle ///'
-  sleep 1
+    printlog "Select empty layout"
+    Call sSelectEmptyLayout
+    sleep 3
+    Kontext "DocumentImpress"
+    sleep 2
+    printlog "create rectangle "
+    hRechteckErstellen (20,20,40,40)
+    sleep 1
+    printlog "create 2nd rectangle"
+    hRechteckErstellen (60,60,70,10)
+    sleep 1
+    printlog "create 3rd rectangle"
+    hRechteckErstellen (50,90,70,40)
+    sleep 1
     Printlog "- Created 3 rectangles for group testing"
-  gMouseClick (50,50)                              '/// Put the mouse-marker in the middle of the screen ///'
-  EditSelectAll 						   '/// select all rectangles ///'
-  if (gApplication = "DRAW") then
-     hOpenContextMenu
+    printlog "Put the mouse-marker in the middle of the screen"
+    gMouseClick (50,50)
+    printlog "select all rectangles"
+    EditSelectAll
+    if (gApplication = "DRAW") then
+        hOpenContextMenu
         sleep(2)
-        hMenuSelectNr(12) ' Select "Group"
+        printlog "Select Group"
+        hMenuSelectNr(12)
         sleep(2)
-  else
-     FormatGroupDraw							   '/// open context menue and group rectangles ///'
-  endif
-  sleep 1
+    else
+        printlog "open context menue and group rectangles"
+        FormatGroupDraw
+    endif
+    sleep 1
     Printlog "- Get position and dimensions of elements"
-  ContextPositionAndSize								'/// get dimensions of group ///'
-  sleep 1
-  Kontext
-  Active.SetPage TabPositionAndSize
-  Kontext "TabPositionAndSize"
-  sleep 1
-  PosX=PositionX.GetText
-  TabPositionAndSize.OK
-  sleep 1
-  Kontext "DocumentImpress"
-  gMouseClick 35,35
-  sleep 1
-  hTypeKeys "<F3>"							'/// entering group using key "F3" ///'
-  sleep 3
-   try
-      EditCut										'/// cut rectangle out of document ///'
-      sleep 1
-      Warnlog "- Entering the group, no object within the group should have been selected"
-   catch
-      Printlog "- entered group, nothing selected"
-   endcatch
-  gMouseClick (35,35)
-  gMouseMove (30,30,60,60)
-  sleep 1
-   Printlog "- Exit group"
-'  DocumentImpress.OpenContextMenu							'/// leave group, compare dimensions ///'
-'  sleep 1
-'  hMenuSelectNr (13)
-  hTypeKeys "<mod1 F3>"							'/// exit group using key "strg F3" ///'
-  ' would be better to call the slot TBO!
-  ContextPositionAndSize
-  sleep 1
-  Kontext
-  Active.SetPage TabPositionAndSize
-  Kontext "TabPositionAndSize"
-  sleep 1
-   if PosX = PositionX.GetText then
-      Warnlog "- No change in position for X axis, even we changed position of 1 object within the group"
-      TabPositionAndSize.OK
-   else
-      Printlog "- Moving within the group works"
-      TabPositionAndSize.OK
-   end if
-  Call hCloseDocument									'/// close document  ///'
-endcase
+    ContextPositionAndSize
+    sleep 1
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    sleep 1
+    PosX=PositionX.GetText
+    TabPositionAndSize.OK
+    sleep 1
+    Kontext "DocumentImpress"
+    gMouseClick 35,35
+    sleep 1
+    printlog "entering group using key F3"
+    hTypeKeys "<F3>"
+    sleep 3
+    try
+        printlog "cut rectangle out of document"
+        EditCut
+        sleep 1
+        Warnlog "- Entering the group, no object within the group should have been selected"
+    catch
+        Printlog "- entered group, nothing selected"
+    endcatch
+    gMouseClick (35,35)
+    gMouseMove (30,30,60,60)
+    sleep 1
+    printlog "leave group, compare dimensions"
+    '  DocumentImpress.OpenContextMenu
+    '  sleep 1
+    '  hMenuSelectNr (13)
+    printlog "exit group using key strg F3"
+    hTypeKeys "<mod1 F3>"
+    ' would be better to call the slot TBO!
+    ContextPositionAndSize
+    sleep 1
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    sleep 1
+    if PosX = PositionX.GetText then
+        Warnlog "- No change in position for X axis, even we changed position of 1 object within the group"
+        TabPositionAndSize.OK
+    else
+        Printlog "- Moving within the group works"
+        TabPositionAndSize.OK
+    end if
+    printlog "close document "
+    Call hCloseDocument
+endcase
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/global/g_imagemap.inc b/testautomation/graphics/optional/includes/global/g_imagemap.inc
index de53fdb6f647..5883bbc8d4ac 100644
--- a/testautomation/graphics/optional/includes/global/g_imagemap.inc
+++ b/testautomation/graphics/optional/includes/global/g_imagemap.inc
@@ -35,12 +35,15 @@
 '\*************************************************************************************
 
 testcase tEditImageMap
-   Call  hNewDocument               '/// new document ///'
-   EditImageMap                  '/// edit image map ///'
+    printlog "new document"
+   Call  hNewDocument
+   printlog "edit image map"
+   EditImageMap                  
    Kontext "ImageMapEditor"
    sleep 1
-   if ImageMapEditor.Exists (2) then         '/// test dialog controls ///'
+   if ImageMapEditor.Exists (2) then         
    printlog "ImageMap editor exists"
+        printlog "test dialog controls"
       DialogTest ( ImageMapEditor )
       try
         ImageMapEditor.Close
@@ -60,52 +63,60 @@ testcase tEditImageMap
         Printlog "ImageMap closed using the edit-menu entry"
       endcatch
    end if
-   Call  hCloseDocument             '/// close document ///'
+   printlog "close document"
+   Call  hCloseDocument             
    
 endcase 'tEditImageMap
-'------------------------------------------------------------------------------------------------------------------------------------
+
+'-------------------------------------------------------------------------------
+
 testcase tEditImageMapProperties
 
     qaerrorlog "test not yet ready."
     goto endsub
-    Call  hNewDocument                  '/// new document ///'
-    InsertGraphicsFromFile               '/// Insert a graphic and select it ///'
+    printlog "new document"
+    Call  hNewDocument
+    printlog "Insert a graphic and select it"
+    InsertGraphicsFromFile               
     sleep (1)
     Kontext "GrafikEinfuegenDlg"
-        sleep (2)
-        Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\SaveAsPicture\SaveAsPicture.pcx")
-        sleep (2)
-        Oeffnen.Click
-        sleep (2)
-    EditImageMap                              '/// Open the image map dialog ///'
-        Kontext "ImageMapEditor"
-        sleep (1)
-        if ImageMapEditor.Exists (2) then         '/// test dialog controls ///'
-            printlog "ImageMap editor exists"
-        else
-            warnlog "Something is wrong, the Imagemap didn't show up."
-        end if
-
-        Ellipse.Click                                   '/// Insert an 'image map' object ///'
-        Dokument.MouseDown 50,50
-        Dokument.MouseMove 50,50,10,10
-        Dokument.MouseUp 10,10
-
-        Eigenschaften.Click                       '/// Click on the properties icon to open up the properties for the Object ///'
-        kontext "ImageMapHyperlink"
-        sleep (1)
-        if ImageMapHyperlink.Exists (2) then 
-            printlog "ImageMapHyperlink (properties) editor exists"
-        else
-            warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up."
-        end if
+    sleep (2)
+    Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\SaveAsPicture\SaveAsPicture.pcx")
+    sleep (2)
+    Oeffnen.Click
+    sleep (2)
+    printlog "Open the image map dialog"
+    EditImageMap
+    Kontext "ImageMapEditor"
+    sleep (1)
+    if ImageMapEditor.Exists (2) then
+        printlog "ImageMap editor exists"
+    else
+        warnlog "Something is wrong, the Imagemap didn't show up."
+    end if
+    printlog "Insert an 'image map' object"
+    Ellipse.Click
+    Dokument.MouseDown 50,50
+    Dokument.MouseMove 50,50,10,10
+    Dokument.MouseUp 10,10
 
-        URL.SetText "http://www.cnn.com"          '/// Write some text in each field ///'
-        Frame.SetText "http://www.framed.com"
-        Objectname.SetText "This is a strange name: Huckillerry Bohaahw"
-        Alternativetext.SetText "Alternative, the only way to fly..."
-        Description.SetText "Just a Foney-text... or whatever it's called."
-        ImageMapHyperlink.Ok        '/// Close the Properties-Dialogue with "Ok" ///'
+    printlog "Click on the properties icon to open up the properties for the Object"
+    Eigenschaften.Click
+    kontext "ImageMapHyperlink"
+    sleep (1)
+    if ImageMapHyperlink.Exists (2) then
+        printlog "ImageMapHyperlink (properties) editor exists"
+    else
+        warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up."
+    end if
+    printlog "Write some text in each field"
+    URL.SetText "http://www.cnn.com"
+    Frame.SetText "http://www.framed.com"
+    Objectname.SetText "This is a strange name: Huckillerry Bohaahw"
+    Alternativetext.SetText "Alternative, the only way to fly..."
+    Description.SetText "Just a Foney-text... or whatever it's called."
+    printlog "Close the Properties-Dialogue with Ok"
+    ImageMapHyperlink.Ok
     kontext "ImageMapEditor"
     Zuweisen.Click
     sleep (1)
@@ -117,7 +128,8 @@ testcase tEditImageMapProperties
         kontext "DocumentImpress"
     end if
 
-    EditImageMap                                        '/// Check if what we wrote in the Properites-Dialogue still is visible."
+    EditImageMap
+    printlog "Check if what we wrote in the Properites-Dialogue still is visible."
     Kontext "ImageMapEditor"
     sleep (1)
     if ImageMapEditor.Exists (2) then   
@@ -128,32 +140,33 @@ testcase tEditImageMapProperties
 
     Dokument.TypeKeys "<TAB>"
     sleep (1)
+    printlog "Click on the properties icon to open up the properties for the Object"
+    Eigenschaften.Click                                 
+    kontext "ImageMapHyperlink"
+    sleep (1)
+    if ImageMapHyperlink.Exists (2) then
+        printlog "ImageMapHyperlink (properties) editor exists"
+    else
+        warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up."
+    end if
 
-    Eigenschaften.Click                                 '/// Click on the properties icon to open up the properties for the Object ///'
-        kontext "ImageMapHyperlink"
-        sleep (1)
-        if ImageMapHyperlink.Exists (2) then   
-            printlog "ImageMapHyperlink (properties) editor exists"
-        else
-            warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up."
-        end if
-
-        '/// Check if the entries we set before has remained the same, with one exception: cnn.com should now have a slash after it.  ///'
-        if URL.GetText <> "http://www.cnn.com/" then warnlog "URL should have been: http://www.cnn.com/ . But was " + URL.GetText
+    printlog "Check if the entries we set before has remained the same, with one exception: cnn.com should now have a slash after it. "
+    if URL.GetText <> "http://www.cnn.com/" then warnlog "URL should have been: http://www.cnn.com/ . But was " + URL.GetText
 '        if Frame.GetSelText <> "http://www.framed.com" then warnlog "Frame should have been: http://www.framed.com. But was " + Frame.GetSelText
-        if Objectname.GetText <> "This is a strange name: Huckillerry Bohaahw"  then warnlog "Objectname. should have been: This is a strange name: Huckillerry Bohaahw. But was " + Objectname.GetText
-        if Alternativetext.GetText <> "Alternative, the only way to fly..." then warnlog "Alternativetext should have been: . But was " + Alternativetext.GetText
-        if Description.GetText <> "Just a Foney-text... or whatever it's called." then warnlog "Description. should have been: . But was " + Description.GetText
-        ImageMapHyperlink.Ok      '/// Close the Properties-Dialogue ///'
-        sleep (1)
+    if Objectname.GetText <> "This is a strange name: Huckillerry Bohaahw"  then warnlog "Objectname. should have been: This is a strange name: Huckillerry Bohaahw. But was " + Objectname.GetText
+    if Alternativetext.GetText <> "Alternative, the only way to fly..." then warnlog "Alternativetext should have been: . But was " + Alternativetext.GetText
+    if Description.GetText <> "Just a Foney-text... or whatever it's called." then warnlog "Description. should have been: . But was " + Description.GetText
+    printlog "Close the Properties-Dialogue"
+    ImageMapHyperlink.Ok
+    sleep (1)
 
     kontext "ImageMapEditor"
     Zuweisen.Click
     sleep (1)
     ImageMapEditor.Close
     sleep (1)
-
-   Call  hCloseDocument             '/// close document ///'
+    printlog "close document"
+    Call  hCloseDocument
    
 endcase 'tEditImageMapProperties
 '------------------------------------------------------------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc
index 8d64e158eb2a..d0d51e8337c7 100644
--- a/testautomation/graphics/optional/includes/global/g_load_save.inc
+++ b/testautomation/graphics/optional/includes/global/g_load_save.inc
@@ -45,76 +45,79 @@
 ' #1 tSaveLoadLayoutSpreadsheet
 '\*************************************************************************************
 testcase tFileOpenSaveEtc
-   Dim Dokument$
-   Dim Dokument2$
+    Dim Dokument$
+    Dim Dokument2$
 
       Dokument$ = ConvertPath ( gOfficePath + "user\work\test1")
       Dokument2$ = ConvertPath ( gOfficePath + "user\work\test1_2")
 
-    if (gApplication = "IMPRESS") then 
+    if (gApplication = "IMPRESS") then
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
 
-   '/// delete previous created documents: 'user\\work\\test1*.od?' ///'
+   printlog "delete previous created documents: 'user\\work\\test1*.od?'"
    if Dir (Dokument$ + ".odp") <> "" then kill (Dokument$ + ".odp")
    if Dir (Dokument2$ + ".odg") <> "" then kill (Dokument2$ + ".odg")
 
-   '/// open application ///'
+   printlog "open application"
    hNewDocument
    gMouseclick 90,90
-   '/// create a textframe with content ///'
+   printlog "create a textframe with content"
    Call hTextrahmenErstellen ( "This is a test",20,20,40,30 )
-   '/// save file as 'test1' ///'
+   printlog "save file as 'test1'"
    hFileSaveAsKill (Dokument$ + "." + ExtensionString)
    Sleep 10
-   '/// close Document ///'
+   printlog "close Document"
    hCloseDocument
-   printlog "- Document Saved and Closed"
+   printlog "Document Saved and Closed"
 
-   '/// load document 'test1' ///'
+   printlog "load document 'test1'"
    hFileOpen (Dokument$ + "." + ExtensionString)
 
-   Sleep 10
-   '/// close Document ///'
-   hCloseDocument
-   printlog "- document Loaded and closed"
-   Sleep 10
-   '/// load document 'test1' ///'
-   hFileOpen (Dokument$ + "." + ExtensionString)
-   ' 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."
-         goto endsub
-      endif
-   endif
-   Sleep 10
-   gMouseclick 90,90
-   '/// create another textbox with content ///'
-   Call hTextrahmenerstellen ( "Change",60,60,80,80 )
-   '/// File->Close needn't work, just say CANCEL to the question about saving changes! ///'
-   FileClose
-   Kontext ' message about 'something changed should i [overwrite discard cancel]?'
-   if Messagebox.exists (5) then
+    Sleep 10
+    printlog "close Document"
+    hCloseDocument
+    printlog "- document Loaded and closed"
+    Sleep 10
+    printlog "load document 'test1'"
+    hFileOpen (Dokument$ + "." + ExtensionString)
+    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
+    Sleep 10
+    gMouseclick 90,90
+    printlog "create another textbox with content"
+    Call hTextrahmenerstellen ( "Change",60,60,80,80 )
+    printlog "File->Close needn't work, just say CANCEL to the question about saving changes!"
+    FileClose
+    Kontext
+    printlog "message about 'something changed should i [overwrite discard cancel]?'"
+    if Messagebox.exists (5) then
       printlog "2:"+messagebox.gettext
       Messagebox.Cancel
-   else
+    else
       Warnlog "Mesagebox is missing :-("
-   endif
-   printlog "- Document loaded, changed and closed discarding all changes"
+    endif
+    printlog "Document loaded, changed and closed discarding all changes"
 
-   printlog "- Last version"
-   try
-       FileReload								'/// File Reload ///'
+    printlog "Last version"
+    try
+        printlog "File Reload"
+        FileReload
+    catch
+        kontext "DocumentImpress"
+    try
+        printlog "File Reload"
+        FileReload
    catch
-       kontext "documentimpress"
-       try
-           FileReload								'/// File Reload ///'
-       catch
-           warnlog "Damn reload ?? Why ? BREAKPOINT! File reload doesn't work. Create new object and try again :-("
+           warnlog "BREAKPOINT! File reload doesn't work. Create new object and try again :-("
        endcatch
    endcatch
    Kontext
@@ -128,22 +131,24 @@ testcase tFileOpenSaveEtc
    if GetClipboardText = "Change" then Warnlog "- Last version not loaded. Changes in the document still in."
    printlog "- Change document, save it under different name"
    Kontext "DocumentImpress"
-   Call hTextrahmenErstellen ("Change2",10,10,50,20 )		'/// new textbox ///'
+   printlog "new textbox"
+   Call hTextrahmenErstellen ("Change2",10,10,50,20 )		
    gMouseclick 90,90
    sleep 1
-      FileSaveAs
-      Kontext "SpeichernDlg"
-      Dateiname.SetText Dokument2$
-      Speichern.Click
-      kontext "AlienWarning"
-      if AlienWarning.exists(5) then
-         warnlog "#i41983# Alien Warning on export not allowed"
-         AlienWarning.OK
-      endif
-      Kontext "Messagebox"
-      if Messagebox.Exists(2) then Messagebox.Yes
+    FileSaveAs
+    Kontext "SpeichernDlg"
+    Dateiname.SetText Dokument2$
+    Speichern.Click
+    kontext "AlienWarning"
+    if AlienWarning.exists(5) then
+     warnlog "#i41983# Alien Warning on export not allowed"
+     AlienWarning.OK
+    endif
+    Kontext "Messagebox"
+    if Messagebox.Exists(2) then Messagebox.Yes
    Sleep 3
-   FileClose								'/// Close document ///'
+   printlog "Close document"
+   FileClose								
    sleep 10
       Kontext "Messagebox"
       if Messagebox.Exists Then
@@ -152,42 +157,42 @@ testcase tFileOpenSaveEtc
       end if
       sleep 2
       printlog "- Loading write protected file"
-      FileOpen								'/// Open write protected file ///'
+      FileOpen
+      printlog "Open write protected file"
       Kontext "OeffnenDlg"
       Dateiname.SetText (Dokument2$ + "." + ExtensionString)
       NurLesen.Check
       Oeffnen.Click
-   Sleep 10
-   ' check if the document is writable
-   try
-      Call hTextrahmenErstellen ( "Hello",85,85,95,95 )			'/// attempt to create a textbox ///'
-      hTypeKeys "<SHIFT LEFT>",5
-      hTypeKeys "<MOD1 C>"
-      sleep 1
-      if GetClipboardText = "Hello" then Warnlog "Write protected document could be edited"
+    Sleep 10
+    printlog "check if the document is writable"
+    try
+        printlog "attempt to create a textbox"
+        Call hTextrahmenErstellen ( "Hello",85,85,95,95 )
+        hTypeKeys "<SHIFT LEFT>",5
+        hTypeKeys "<MOD1 C>"
+        sleep 1
+        if GetClipboardText = "Hello" then Warnlog "Write protected document could be edited"
    catch
-      Printlog "- Write protected document could not be edited"
+        Printlog "- Write protected document could not be edited"
    endcatch
    sleep 5
-   FileClose								'/// Close document ///'
+   printlog "Close document"
+   FileClose								
    
 endcase 'tFileOpenSaveEtc
-'--------------------------------------------------------
+'-------------------------------------------------------------------------------
 testcase tFileProperties
 
     qaerrorlog "#i88163#, File/properties/user defined fields get mixed up."
     goto endsub
     Call hNewDocument
     Call hTextrahmenErstellen ("This is a document to test the Menupoint in File/Properties",30,30,60,40)
-
     if (gApplication = "IMPRESS") then
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
-
     FileProperties
-
     Kontext
     active.SetPage TabDokumentinfo
     Kontext "TabDokumentinfo"
@@ -212,9 +217,7 @@ testcase tFileProperties
     RefreshThisDocument.Check
 
     TabInternet.OK
-
     hFileSaveAsKill ConvertPath (gOfficePath + "user\work\eigen." & ExtensionString)
-
     FileClose
     Kontext "Active"
     if Active.Exists(2) then Active.Yes
@@ -223,45 +226,45 @@ testcase tFileProperties
         Sleep 2
         hFileOpen ConvertPath (gOfficePath + "user\work\eigen." + ExtensionString)
 
-        ' 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
             endif
         endif
-        FileProperties
-        Kontext
-        active.SetPage TabDokumentinfo
-        Kontext "TabDokumentinfo"
-        if Titel.GetText <> "Properties" then Warnlog "Description / Titel is wrong"
-            if Thema.GetText <> "Documentproperties" then Warnlog "Description / Thema is wrong"
-                if Schluesselworte.GetText <> "None" then Warnlog "Description / Keywords is wrong"
-
-                    qaerrorlog "#i95523#"
-                    'Kontext
-                    'active.SetPage TabBenutzer
-                    'Kontext "TabBenutzer"
-                    'if Info2.GetText <> "Thorsten Peters" then Warnlog "User Defined / Info2 is wrong"
-
-                    'Infofelder.Click
-                    'sleep 2
-                    'Kontext "InfonamenBearbeiten"
-                    'if Namen2.GetText <> "Name" then Warnlog "Edit Field Names / Info2 is wrong"
-                    'InfonamenBearbeiten.OK
-
-                    Kontext
-                    active.SetPage TabInternet
-                    Kontext "TabInternet"
-                    if RefreshThisDocument.IsChecked = FALSE then Warnlog "Internet / 'Refresh this document' is not checked"
-
-                        TabInternet.Close
-
-                        Call hCloseDocument
-endcase
-
-'********************************************************************************************
+    FileProperties
+    Kontext
+    active.SetPage TabDokumentinfo
+    Kontext "TabDokumentinfo"
+    if Titel.GetText <> "Properties" then Warnlog "Description / Titel is wrong"
+    if Thema.GetText <> "Documentproperties" then Warnlog "Description / Thema is wrong"
+    if Schluesselworte.GetText <> "None" then Warnlog "Description / Keywords is wrong"
+
+    qaerrorlog "#i95523#"
+    'Kontext
+    'active.SetPage TabBenutzer
+    'Kontext "TabBenutzer"
+    'if Info2.GetText <> "Thorsten Peters" then Warnlog "User Defined / Info2 is wrong"
+
+    'Infofelder.Click
+    'sleep 2
+    'Kontext "InfonamenBearbeiten"
+    'if Namen2.GetText <> "Name" then Warnlog "Edit Field Names / Info2 is wrong"
+    'InfonamenBearbeiten.OK
+
+    Kontext
+    active.SetPage TabInternet
+    Kontext "TabInternet"
+    if RefreshThisDocument.IsChecked = FALSE then Warnlog "Internet / 'Refresh this document' is not checked"
+
+    TabInternet.Close
+
+    Call hCloseDocument
+endcase 'tFileProperties
+
+'-------------------------------------------------------------------------------
 
 testcase tFilePassword52
     Dim Datei$
@@ -271,7 +274,6 @@ testcase tFilePassword52
     dim sExt() as string
 
     sExt = array("d","a")
-    '   passwo52.sd d-preas a-draw
     for i = 0 to 1
         Datei$ = ConvertPath ( gTesttoolPath + "graphics\required\input\passwo52.sd"+sExt(i) )
         hFileOpen(Datei$)
@@ -290,9 +292,9 @@ testcase tFilePassword52
         endif
         hCloseDocument
     next i
-endcase
+endcase 'tFilePassword52
 
-'********************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tFileOpenImport
     dim q as integer
@@ -324,28 +326,28 @@ testcase tFileOpenImport
     if (gApplication="DRAW") then
         Call hCloseDocument
     endif
-endcase
+endcase 'tFileOpenImport
 
-'********************************************************************************************
+'-------------------------------------------------------------------------------
 testcase tTestDXF255CharBug
 
-'/// tries to load a DXF-document which has a string-leght of 255 characters. ///'
-dim q as integer
-   call hNewDocument
-   InsertGraphicsFromFile								'/// insert graphic  ///'
-   sleep 1
-   kontext "Active"
-   sleep 1
+    printlog "tries to load a DXF-document which has a string-leght of 255 characters."
+    dim q as integer
+    call hNewDocument
+    printlog "insert graphic "
+    InsertGraphicsFromFile
+    sleep 1
+    kontext "Active"
+    sleep 1
     if Active.Exists Then
-       Active.OK
+        Active.OK
     end if
     sleep 1
-   Kontext "GrafikEinfuegenDlg"
-      sleep 2
-      '///  Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\255chars.dxf")) ///'
-      Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\255chars.dxf"))
-      Oeffnen.Click
-   Sleep 2
+    Kontext "GrafikEinfuegenDlg"
+    sleep 2
+    Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\255chars.dxf"))
+    Oeffnen.Click
+    Sleep 2
 
    if gApplication = "DRAW" then
       Kontext "Documentdraw"
@@ -375,7 +377,7 @@ dim q as integer
    Call hCloseDocument
    
 endcase 'tTestDXF255CharBug
-'********************************************************************************************
+'-------------------------------------------------------------------------------
 testcase tDeletedTemplate
 
     dim i as integer
@@ -395,35 +397,35 @@ testcase tDeletedTemplate
 
     
 
-   '/// delete previous created documents: 'user\\work\\test*.odp' ///'
+   printlog "delete previous created documents: 'user\\work\\test*.odp'"
    if Dir (Dokument1$) <> "" then kill Dokument1$
    if Dir (Dokument2$) <> "" then kill Dokument2$
 
-   '/// open application ///'
+   printlog "open application"
    hNewDocument
    gMouseclick 90,90
-   '/// create a textframe with content ///'
+   printlog "create a textframe with content"
    Call hTextrahmenErstellen ( "This is the first file",20,20,40,30 )
-   '/// save file as 'test1.odp' ///'
+   printlog "save file as 'test1.odp'"
    hFileSaveAsKill (Dokument1$)
    Sleep 10
-   '/// close Document ///'
+   printlog "close Document"
    hCloseDocument
    printlog "-  Document 'test1.odp' Saved and Closed"
 
-   '/// open application again ///'
+   printlog "open application again"
    hNewDocument
    gMouseclick 90,90
-   '/// create another textframe with content ///'
+   printlog "create another textframe with content"
    Call hTextrahmenErstellen ( "This is the second file",20,20,40,30 )
-   '/// save file as 'test2.odp' ///'
+   printlog "save file as 'test2.odp'"
    hFileSaveAsKill (Dokument2$)
    Sleep 10
-   '/// close Document ///'
+   printlog "close Document"
    hCloseDocument
    printlog "-  Document 'test2.odp' Saved and Closed"
 
-   '/// Delete the first file ///'
+   printlog "Delete the first file"
    try
        kill Dokument1$
        Printlog "   Correctly deleted the file: " + Dokument1$
@@ -431,28 +433,29 @@ testcase tDeletedTemplate
        warnlog "Could not delete the file: " + Dokument1$
    endcatch
 
-   '/// File => New => Presentation ///'
-   FileAutopilotPresentation				'/// new document-autopilot ///'
-      Kontext "AutopilotPraesentation1"
-      sleep 5
-      Existingpresentation.Check
-      sleep 5
-      kontext "active"
-      if active.exists then
-         SavedActiveMessage = Active.GetText
-         QaErrorLog "Message: " + SavedActiveMessage
-         active.ok
-         Kontext "AutopilotPraesentation1"
-         if Existinglist.GetSelText = "test1.odp" then
-            warnlog "   The deleted File was found. Messagebox said: " + SavedActiveMessage
-         endif
-         SavedActiveMessage = ""
-      endif
-      Kontext "AutopilotPraesentation1"
-      Existinglist.TypeKeys "<HOME>"
-      sleep 5
-      found = false
-      for i = 1 to Existinglist.GetItemCount
+    printlog "File => New => Presentation"
+    printlog "new document-autopilot"
+    FileAutopilotPresentation
+    Kontext "AutopilotPraesentation1"
+    sleep 5
+    Existingpresentation.Check
+    sleep 5
+    kontext "active"
+    if active.exists then
+    SavedActiveMessage = Active.GetText
+    QaErrorLog "Message: " + SavedActiveMessage
+    active.ok
+    Kontext "AutopilotPraesentation1"
+    if Existinglist.GetSelText = "test1.odp" then
+    warnlog "   The deleted File was found. Messagebox said: " + SavedActiveMessage
+    endif
+    SavedActiveMessage = ""
+    endif
+    Kontext "AutopilotPraesentation1"
+    Existinglist.TypeKeys "<HOME>"
+    sleep 5
+    found = false
+    for i = 1 to Existinglist.GetItemCount
           kontext "active"
           if active.exists then
              SavedActiveMessage = Active.GetText
@@ -473,7 +476,7 @@ testcase tDeletedTemplate
       if found = true then warnlog "   An error-message showed up. Eventually a result of '138498'"
       AutopilotPraesentation1.Cancel
    Sleep 2
-   '/// Delete the second file ///'
+   printlog "Delete the second file"
     try
         kill Dokument2$
         Printlog "   Correctly deleted the file: " + Dokument2$
@@ -482,7 +485,7 @@ testcase tDeletedTemplate
     endcatch
 
 endcase 'tDeletedTemplate
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutEmpty
     Dim NewFileDir as String
@@ -492,7 +495,6 @@ testcase tSaveLoadLayoutEmpty
     printlog "   Will try to create the directory: " + NewFileDir
     app.mkdir NewFileDir
 
-
     gApplication = "IMPRESS"
     Call hNewDocument
 
@@ -510,13 +512,12 @@ testcase tSaveLoadLayoutEmpty
     sleep (5)
 
     call fSaveLoadAllFormats (NewFileDir)   'Runs the Function below.
-
-    printlog "   Will try to delete the directory: " + NewFileDir
+    printlog "Will try to delete the directory: " + NewFileDir
     app.rmDir NewFileDir
 
 endcase 'tSaveLoadLayoutEmpty
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutOLE
     qaerrorlog "not yet ready"
@@ -525,7 +526,7 @@ testcase tSaveLoadLayoutOLE
 
     NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\")
 
-    printlog "   Will try to create the directory: " + NewFileDir
+    printlog "Will try to create the directory: " + NewFileDir
     app.mkdir NewFileDir
 
 
@@ -563,12 +564,12 @@ testcase tSaveLoadLayoutOLE
 
     call fSaveLoadAllFormats (NewFileDir)   'Runs the Function below.
 
-    printlog "   Will try to delete the directory: " + NewFileDir
+    printlog "Will try to delete the directory: " + NewFileDir
     app.rmDir ConvertPath (gOfficePath + "user\work\LayoutTest\")' NewFileDir
 
 endcase 'tSaveLoadLayoutOLE
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutText
     qaerrorlog "not yet ready"
@@ -580,7 +581,6 @@ testcase tSaveLoadLayoutText
     printlog "   Will try to create the directory: " + NewFileDir
     app.mkdir NewFileDir
 
-
     gApplication = "IMPRESS"
     Call hNewDocument
 
@@ -601,17 +601,16 @@ testcase tSaveLoadLayoutText
     hTypeKeys ("<TAB><TAB><TAB>")
     hTypeKeys ("<Return>")
     hTypeKeys ("<ESCAPE>")
-    '       LayoutsPreview.TypeKeys "<RETURN>"
     sleep (5)
 
     call fSaveLoadAllFormats (NewFileDir)   'Runs the Function below.
 
-    printlog "   Will try to delete the directory: " + NewFileDir
+    printlog "Will try to delete the directory: " + NewFileDir
     app.rmDir ConvertPath (gOfficePath + "user\work\LayoutTest\")' NewFileDir
 
 endcase 'tSaveLoadLayoutText
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutOutline
     qaerrorlog "not yet ready"
@@ -623,7 +622,6 @@ testcase tSaveLoadLayoutOutline
     printlog "   Will try to create the directory: " + NewFileDir
     app.mkdir NewFileDir
 
-
     gApplication = "IMPRESS"
     Call hNewDocument
 
@@ -653,7 +651,7 @@ testcase tSaveLoadLayoutOutline
 
 endcase 'tSaveLoadLayoutOutline
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutPicture
     qaerrorlog "not yet ready"
@@ -665,7 +663,6 @@ testcase tSaveLoadLayoutPicture
     printlog "   Will try to create the directory: " + NewFileDir
     app.mkdir NewFileDir
 
-
     gApplication = "IMPRESS"
     Call hNewDocument
 
@@ -695,7 +692,7 @@ testcase tSaveLoadLayoutPicture
 
 endcase 'tSaveLoadLayoutPicture
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutChart
     qaerrorlog "not yet ready"
@@ -707,7 +704,6 @@ testcase tSaveLoadLayoutChart
     printlog "   Will try to create the directory: " + NewFileDir
     app.mkdir NewFileDir
 
-
     gApplication = "IMPRESS"
     Call hNewDocument
 
@@ -737,7 +733,7 @@ testcase tSaveLoadLayoutChart
 
 endcase 'tSaveLoadLayoutChart
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutSpreadsheet
     qaerrorlog "not yet ready"
@@ -749,7 +745,6 @@ testcase tSaveLoadLayoutSpreadsheet
     printlog "   Will try to create the directory: " + NewFileDir
     app.mkdir NewFileDir
 
-
     gApplication = "IMPRESS"
     Call hNewDocument
 
@@ -774,10 +769,10 @@ testcase tSaveLoadLayoutSpreadsheet
 
     call fSaveLoadAllFormats (NewFileDir)   'Runs the Function below.
 
-    printlog "   Will try to delete the directory: " + NewFileDir
+    printlog "Will try to delete the directory: " + NewFileDir
     app.rmDir ConvertPath (gOfficePath + "user\work\LayoutTest\")' NewFileDir
 
 endcase 'tSaveLoadLayoutSpreadsheet
 
-'****************************************************************************************************
+'-------------------------------------------------------------------------------
 
diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
index 5961a2132467..f78cdf816815 100644
--- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
+++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
@@ -47,37 +47,39 @@ testcase g_mediaplayer
            goto endsub
         endif
         Datei$ = ConvertPath (convertPath (gTesttoolPath + "graphics\required\input\29secsound.wav"))
-        '/// Open New Document ///'
+        printlog "Open New Document"
         Call hNewDocument
         sleep 2
-        '/// Check if the Media Player already exists - if so - close it ///'
+        printlog "Check if the Media Player already exists - if so - close it"
         kontext "mPlayer"
-        if mPlayer.exists then ' Close the MediaPlayer
-           warnlog "The MediaPlayer was visible since some earlier test. Plese notify FHA."
+        printlog "Close the MediaPlayer if it is open already"
+        if mPlayer.exists then 
+           warnlog "The MediaPlayer was visible since some earlier test."
            ToolsMediaPlayer
            printlog "Closed the Media Player"
         endif
         
-        '/// Tools - MediaPlayer ///'
+        printlog "Tools - MediaPlayer"
         ToolsMediaPlayer
         sleep 2
-        '/// Open file ///' 'a bigger / longer one
+        printlog "Open file"
         kontext "mPlayer"
         if mPlayer.exists then
            printlog "The MediaPlayer was open."
         else
-           warnlog "Tools - MediaPlayer didnt work. The MediaPlayer wasnt visible. Aborting test."
-           Call  hCloseDocument    '/// Close document ///'
-           goto endsub
+            warnlog "Tools - MediaPlayer didnt work. The MediaPlayer wasnt visible. Aborting test."
+            printlog "Close document"
+            Call  hCloseDocument
+            goto endsub
         endif
         Mopen.Click
         kontext "OeffnenDlg"
         Pfad.SetText Datei$
         Oeffnen.Click
         
-        '/// This test wont work correctly under Solaris and Linux, ///'
-        '/// unless some optional Media-libraries are installed. ///'
-        '/// Therefore we warn the tester about it if we cannot open the file. ///'
+        printlog "This test wont work correctly under Solaris and Linux,"
+        printlog "unless some optional Media-libraries are installed."
+        printlog "Therefore we warn the tester about it if we cannot open the file."
         
         iWaitIndex = 0
         do while OeffnenDlg.Exists AND iWaitIndex < 10
@@ -90,7 +92,8 @@ testcase g_mediaplayer
            Active.OK
            kontext "Mplayer"
            ToolsMediaPlayer
-           Call hCloseDocument   '/// close document ///'
+           printlog "close document"
+           Call hCloseDocument   
            goto endsub
         else
            kontext "Mplayer"
@@ -99,7 +102,7 @@ testcase g_mediaplayer
         
         timevalue1 = mTimeedit.GetText
         
-        '/// Stop ///'
+        printlog "Stop"
         sleep 2
         mStop.Click
         printlog "Just pressed stop."
@@ -109,17 +112,18 @@ testcase g_mediaplayer
         timevalue3 = mTimeedit.GetText
         printlog "The time was: " + mTimeedit.GetText
         if timevalue1 = timevalue2 AND timevalue2 = timevalue3 then
-           if gtSYSName <> "WinXP" then '("Solaris x86" OR "Linux" OR "Solaris") then
-              warnlog "The sound doesnt seem to be played at all. And since the test is run on a platform which needs extra libraries, the test ends now."
-              kontext "Mplayer"
-              if Mplayer.Exists(3) then
-                 ToolsMediaPlayer
-          endif
-              Call  hCloseDocument   '/// close document ///'
-              goto endsub
-           else
-              warnlog "The sound doesnt seem to be played at all, but I will continue the test. The platform was: " + gtSYSName
-           endif
+            if gtSYSName <> "WinXP" then '("Solaris x86" OR "Linux" OR "Solaris") then
+            warnlog "The sound doesnt seem to be played at all. And since the test is run on a platform which needs extra libraries, the test ends now."
+            kontext "Mplayer"
+            if Mplayer.Exists(3) then
+                ToolsMediaPlayer
+            endif
+            printlog "close document"
+            Call  hCloseDocument
+            goto endsub
+        else
+            warnlog "The sound doesnt seem to be played at all, but I will continue the test. The platform was: " + gtSYSName
+        endif
         else
            if timevalue1 <> timevalue2 AND timevalue2 = timevalue3 then
               Printlog "the stop-button seemed to work. Good."
@@ -127,7 +131,7 @@ testcase g_mediaplayer
               warnlog "Very strange. The first value was: " + timevalue1 + ". Second: " + timevalue2 + ". Third: " + timevalue3
            endif
         endif
-        '/// Play ///'
+        printlog "Play"
         ' Save value
         timevalue1 = mTimeedit.GetText
         ' Press 'Play'
@@ -141,7 +145,7 @@ testcase g_mediaplayer
            Printlog "the play-button seemed to work. Good."
         endif
         
-        '/// Pause ///'
+        printlog "Pause"
         mPlay.Click
         sleep 10
         mPause.Click
@@ -156,19 +160,23 @@ testcase g_mediaplayer
            Printlog "the pause-button seemed to work. Good."
         endif
         
-        '/// Time ///'
-        mStop.Click  'to get to the beginning.
-        sleep 1      'And make sure it's really the beginning.
+        printlog "Time"
+        printlog " Click Stop to get to the beginning."
+        mStop.Click  
+        sleep 1
+        printlog "And make sure it's really the beginning."
         timevalue1 = mTimeedit.GetText
         if timevalue1 <> "00:00:00 / 00:00:29" then
            warnlog "Expected the time to go back to 00:00:00, but was " + timevalue1 + " instead."
-           mStop.Click  'to make another try to get to the beginning again.
+            printlog "to make another try to get to the beginning again."
+            mStop.Click  '
         else
            printlog "Sound stopped, time-value set to 00:00:00."
         endif
         
         printlog "We press 'Play'"
-        mPlay.Click  'to get it running
+        printlog "Click play to get it running"
+        mPlay.Click 
         sleep 5
         timefound = 0
         
@@ -192,41 +200,34 @@ testcase g_mediaplayer
            warnlog "Either the time didnt change, or the test-computer is too fast."
         endif
         
-        '-Repeat
-         'Plays the file repeatedly.
-        '/// Loop ///'
+        printlog "Loop"
         mLoop.Click
         
-        '/// Volume ///'
-        'mVolume. 'Click
-        '-Volume slider
-         'Adjusts the volume.
+        printlog "Volume"
         
-        '/// Mute ///'
+        printlog "Mute"
         mMute.Click
         sleep 1
         mMute.Click
-        '-Mute
-        'Turns sound off and on.
         
-        '/// Time-slider ///'
+        printlog "Time-slider"
         ' mTimeslider. 'Click
          '-Position slider
           'Moves to a different position in the file.
         
-        '/// Scroll-whatever ///'
+        printlog "Scroll-whatever"
         'mZoomlistbox.
         '-Zoom
          'Adjusts the size of the movie playback.
         
-        '/// Apply ///'
+        printlog "Apply"
         mInsert.Click
         sleep 10
         
-        '/// Close the MediaPlayer via Tools - MediaPlayer ///'
+        printlog "Close the MediaPlayer via Tools - MediaPlayer"
         ToolsMediaPlayer
         
-        '/// Check if there is an object available. ///'
+        printlog "Check if there is an object available."
         if (gApplication = "IMPRESS") then
            kontext "DocumentImpress"
         else
@@ -242,15 +243,15 @@ testcase g_mediaplayer
         Kontext "TabPositionAndSize"
         if Width.Exists then
            Printlog "Position and Size came up, object inserted correctly."
-           '/// Close dialog TabPositionAndSize with 'OK' ///'
+           printlog "Close dialog TabPositionAndSize with 'OK'"
            TabPositionAndSize.OK
         else
            Warnlog "Position And Size didn't come up, was there no sound-object inserted?"
         endif
         sleep 2
-        '/// close document ///'
-        Call  hCloseDocument	'/// close document ///'
+        printlog "close document"
+        Call  hCloseDocument	
     else
         qaerrorLog "#74350# - Different strings in g_mediaplayer under Italian."
     endif
-endcase
+endcase
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc
index 1dfd01f305aa..7732cc5bc7e8 100644
--- a/testautomation/graphics/optional/includes/global/g_shaddow.inc
+++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc
@@ -54,19 +54,19 @@ testcase tiShaddow
    dim linewidth as string
    dim cornerstyletype as string
 
-    '/// Set the file-extension we'll be using when opening the saved file ///'
+    printlog "Set the file-extension we'll be using when opening the saved file "
     if (gApplication = "IMPRESS") then
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
 
-   '/// Open application ///'
+   printlog "Open application "
    Call hNewDocument
    Call sSelectEmptyLayout
    sleep 1
 
-   '/// Import picture ///'
+   printlog "Import picture "
    InsertGraphicsFromFile
       sleep 3
       kontext "Active"
@@ -81,10 +81,10 @@ testcase tiShaddow
       Oeffnen.Click
    printlog "Inserted file"
    sleep 2
-   '/// Select all ///'
+   printlog "Select all"
    EditSelectAll
    sleep 3
-   '/// Check values and save them ///'
+   printlog "Check values and save them"
    FormatPositionAndSize
       kontext
       active.SetPage TabPositionAndSize
@@ -92,11 +92,11 @@ testcase tiShaddow
       ImageWidth = Width.GetText
       ImageHeight = Height.GetText
       printlog "Got values from position and size"
-   '/// Check the "Protect Size"-button. And close dialogue. ///'
+   printlog "Check the Protect Size-button. And close dialogue. "
       ProtectSize.Check
       TabPositionAndSize.Ok
 
-   '/// Add Shaddow via Toolbar-Button ///'
+   printlog "Add Shaddow via Toolbar-Button "
        Kontext "GraphicObjectbar"
        if GraphicObjectbar.Exists = FALSE then 
            ViewToolbarsPicture
@@ -106,21 +106,21 @@ testcase tiShaddow
        end if
        sleep 1
 
-   '/// click button 'Shadow' ///'
-   Schatten.Click
-'  '/// Check and save Shaddow-values via context-menu ///'
-   EditSelectAll
-   hOpenContextMenu
-      sleep(2)
-      if hMenuFindSelect(10142, true, 4) = false then
+    printlog "click button 'Shadow'"
+    Schatten.Click
+    printlog " Check and save Shaddow-values via context-menu "
+    EditSelectAll
+    hOpenContextMenu
+    sleep(2)
+    if hMenuFindSelect(10142, true, 4) = false then
          Warnlog "Context-Menu-entry `Area` was not found. Therefore the test ends."
          Call hCloseDocument
          Goto Endsub
-      endif
-   '/// Select Contextmenu entry "Area" ///'
-      sleep(2)
+    endif
+    printlog " Select Contextmenu entry Area "
+    sleep(2)
    kontext "TabArea"
-   '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue
+   printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue"
    Kontext
    active.SetPage TabSchatten
    kontext "TabSchatten"
@@ -131,20 +131,20 @@ testcase tiShaddow
          Warnlog "'Use Shadow' doesn't exist or isn't visible."
       endif
 
-      '/// Change Distance and Transparency-values ///'
-      Entfernung.More ',2
-      Transparenz.More ',2
-      shadowdistancevalue = Entfernung.GetText
-      shadowcolorvalue = Farbe.GetSelText
-      shadowtransparencyvalue = Transparenz.GetText
-      printlog "Got values from TabArea"
-   TabSchatten.Ok
+    printlog "Change Distance and Transparency-values "
+    Entfernung.More ',2
+    Transparenz.More ',2
+    shadowdistancevalue = Entfernung.GetText
+    shadowcolorvalue = Farbe.GetSelText
+    shadowtransparencyvalue = Transparenz.GetText
+    printlog "Got values from TabArea"
+    TabSchatten.Ok
 
-   '/// Check if it's the same when going over FormatArea ///'
+   printlog "Check if it's the same when going over FormatArea "
    FormatArea
    sleep 1
    kontext "TabArea"
-   '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue ///'
+   printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue "
    Kontext
    active.SetPage TabSchatten
    kontext "TabSchatten"
@@ -165,23 +165,23 @@ testcase tiShaddow
     endif
    TabSchatten.Ok
 
-   '/// Add Cornerstyle via FormatLine ///'
-   FormatLine
-      Kontext
-      Messagebox.SetPage TabLinie
-         kontext "TabLinie"
-         Stil.Select 2    ' Select Continuously.
-         linetype = Stil.GetItemText
-         Farbe.Select 2 ' Select Blue
-         linecolour = Farbe.GetItemText
-         Breite.More 3 ' Set Width to 3
-         linewidth = Breite.Gettext
-         CornerStyle.Select 4 ' Select number four: Beveled
-         cornerstyletype = CornerStyle.GetSelText
-         printlog "Cornerstyle is: " + CornerStyle.GetSelText '+ cornerstyletype
+    printlog "Add Cornerstyle via FormatLine "
+    FormatLine
+    Kontext
+    Messagebox.SetPage TabLinie
+    kontext "TabLinie"
+    Stil.Select 2    ' Select Continuously.
+    linetype = Stil.GetItemText
+    Farbe.Select 2 ' Select Blue
+    linecolour = Farbe.GetItemText
+    Breite.More 3 ' Set Width to 3
+    linewidth = Breite.Gettext
+    CornerStyle.Select 4 ' Select number four: Beveled
+    cornerstyletype = CornerStyle.GetSelText
+    printlog "Cornerstyle is: " + CornerStyle.GetSelText '+ cornerstyletype
       TabLinie.ok
 
-   '/// Check values via PositionAndSize via the Contextmenu ///'
+   printlog "Check values via PositionAndSize via the Contextmenu "
    hOpenContextmenu
       sleep(2)
       if hMenuFindSelect(10087, true, 1) = false then
@@ -189,35 +189,35 @@ testcase tiShaddow
          Call hCloseDocument
          Goto Endsub
       endif
-      'Select "Position and Size"
-      sleep(2)
-      Kontext
-      Active.SetPage TabPositionAndSize
-      Kontext "TabPositionAndSize"
-      if ImageWidth <> Width.GetText then warnlog "Position X differs. Should be: " + ImageWidth + " But is: " + Width.GetText
-      if ImageHeight <> Height.GetText then warnlog "Position Y differs. Should be: " + ImageHeight + " But is: " + Height.GetText
+    printlog "Select Position and Size"
+    sleep(2)
+    Kontext
+    Active.SetPage TabPositionAndSize
+    Kontext "TabPositionAndSize"
+    if ImageWidth <> Width.GetText then warnlog "Position X differs. Should be: " + ImageWidth + " But is: " + Width.GetText
+    if ImageHeight <> Height.GetText then warnlog "Position Y differs. Should be: " + ImageHeight + " But is: " + Height.GetText
    TabPositionAndSize.OK
 
-   '/// Check Cornerstyle via FormatLine ///'
-   FormatLine
-      Kontext
-      Messagebox.SetPage TabLinie
-         kontext "TabLinie"
-         if linetype <> Stil.GetItemText then warnlog "Linetype should be: " + linetype + " But is: " + Stil.GetItemText
-         if linecolour <> Farbe.GetItemText then warnlog "Linecolour should be: " + linetype + " But is: " + Farbe.GetItemText
-         if linewidth <> Breite.GetText then warnlog "Linewidth should be: " + linewidth + " But is: " + Breite.GetText
-         if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText
-      TabLinie.ok
-
-   '/// Check if the Shaddow-button is activated ///'
-      Kontext "GraphicObjectbar"
-      if Schatten.GetState(2) <> 1 then 
-          warnlog "Shaddow-button shouldnt have been checked"
-      endif
+   printlog "Check Cornerstyle via FormatLine "
+    FormatLine
+    Kontext
+    Messagebox.SetPage TabLinie
+    kontext "TabLinie"
+    if linetype <> Stil.GetItemText then warnlog "Linetype should be: " + linetype + " But is: " + Stil.GetItemText
+    if linecolour <> Farbe.GetItemText then warnlog "Linecolour should be: " + linetype + " But is: " + Farbe.GetItemText
+    if linewidth <> Breite.GetText then warnlog "Linewidth should be: " + linewidth + " But is: " + Breite.GetText
+    if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText
+    TabLinie.ok
+
+    printlog "Check if the Shaddow-button is activated "
+    Kontext "GraphicObjectbar"
+    if Schatten.GetState(2) <> 1 then
+        warnlog "Shaddow-button shouldnt have been checked"
+    endif
 
-   '/// Save the file. Then close the office and reload the file ///'
+   printlog "Save the file. Then close the office and reload the file "
    sFileName = ( ConvertPath(gOfficePath + "user\work\shaddow-test"))
-   '/// File-Save As with filter as: "user\temp\shaddow-test" ///'
+   printlog "File-Save As with filter as: user\temp\shaddow-test "
    try
       FileSaveAs
          Kontext "SpeichernDlg"
@@ -233,12 +233,12 @@ testcase tiShaddow
       warnlog "Error when saving file."
    endcatch
 
-   '/// Close the office-session ///'
+   printlog "Close the office-session "
    FileClose
       Kontext "Messagebox"
       if Messagebox.Exists(2) then Messagebox.Yes
    Sleep 3
-   '/// Open the saved file ///'
+   printlog "Open the saved file "
    try
       hFileOpen sFileName + "." + ExtensionString
       Sleep 3
@@ -247,11 +247,11 @@ testcase tiShaddow
       warnlog "Error when opening file."
    endcatch
 
-   '/// Select all ///'
+   printlog "Select all "
    EditSelectAll
    sleep 2
 
-   '/// Check if the Shaddow-button still is activated ///'
+   printlog "Check if the Shaddow-button still is activated "
    kontext "GraphicObjectbar"
    if schatten.Getstate(2) <> 1 then
       warnlog "The Shadow-button should be activated"
@@ -259,7 +259,7 @@ testcase tiShaddow
       Printlog "Shaddowbutton activated, good."
    endif
 
-   '/// Check the attributes for the picture ///'
+   printlog "Check the attributes for the picture "
    hOpenContextmenu
       sleep(2)
       if hMenuFindSelect(10087, true, 1) = false then
@@ -267,7 +267,7 @@ testcase tiShaddow
          Call hCloseDocument
          Goto Endsub
       endif
-      'Select "Position and Size"
+      printlog "Position and Size"
       sleep(2)
       Kontext
       Active.SetPage TabPositionAndSize
@@ -279,7 +279,7 @@ testcase tiShaddow
    FormatArea
       sleep 1
       kontext "TabArea"
-      '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue ///'
+      printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue "
       Kontext
       active.SetPage TabSchatten
       kontext "TabSchatten"
@@ -293,7 +293,7 @@ testcase tiShaddow
          if shadowcolorvalue <> Farbe.GetSelText then warnlog "Color value changed. Should be: " + shadowcolorvalue + ". But is: " + Farbe.gettext
          if shadowtransparencyvalue <> Transparenz.GetText then warnlog "Transparency value changed. Should be: " + shadowtransparencyvalue + ". But is: " + Transparenz.gettext
 
-   '/// Check Transparency ///'
+   printlog "Check Transparency"
       Kontext
       Active.SetPage TabTransparenz
       kontext "TabTransparenz"
@@ -306,7 +306,7 @@ testcase tiShaddow
    kontext "TabSchatten"
       TabSchatten.Ok
 
-   '/// Check Cornerstyle via FormatLine ///'
+   printlog "Check Cornerstyle via FormatLine "
    FormatLine
       Kontext
       Messagebox.SetPage TabLinie
@@ -317,7 +317,7 @@ testcase tiShaddow
          if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText
       TabLinie.ok
 
-   '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///'
+   printlog "If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. "
     if (gApplication = "IMPRESS") then
         ExtensionString = "ppt"
     else
@@ -344,19 +344,19 @@ testcase tiShaddow
          printlog "Saved as: " + sFileName
       Sleep 3
 
-   '/// Close the office and reload the file ///'
+   printlog "Close the office and reload the file"
    FileClose
       Kontext "Messagebox"
       if Messagebox.Exists(2) then Messagebox.Yes
    Sleep 3
-   '/// Open the saved file ///'
+   printlog " Open the saved file "
    hFileOpen (sFileName + "." + ExtensionString)
    printlog "File opened: " + sFileName + "." + ExtensionString
    Sleep 3
-   '/// Select all ///'
+   printlog "Select all"
    EditSelectAll
 
-   '/// Check the attributes for the picture ///'
+   printlog "Check the attributes for the picture"
    hOpenContextmenu
       sleep(2)
       if hMenuFindSelect(10087, true, 1) = false then
@@ -364,7 +364,7 @@ testcase tiShaddow
          Call hCloseDocument
          Goto Endsub
       endif
-      'Select "Position and Size"
+      printlog "Select Position and Size"
       sleep(2)
       Kontext
       Active.SetPage TabPositionAndSize
@@ -373,7 +373,7 @@ testcase tiShaddow
       if ImageHeight <> Height.GetText then warnlog "Position X differs. Should be: " + ImageHeight + " But is: " + Height.GetText
       TabPositionAndSize.OK
 
-   '/// Check if transparency has disappeared and if the cornerstyle has changed ///'
+   printlog "Check if transparency has disappeared and if the cornerstyle has changed"
    FormatArea
       Kontext
       Messagebox.SetPage TabTransparenz
@@ -402,7 +402,7 @@ testcase tiShaddow
 
    TabTransparenz.Cancel
 
-   '/// Check Cornerstyle via FormatLine ///'
+   printlog "Check Cornerstyle via FormatLine "
    FormatLine
       Kontext
       Messagebox.SetPage TabLinie
@@ -413,7 +413,7 @@ testcase tiShaddow
          if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText
       TabLinie.ok
 
-   '/// Remove the Shaddow, Transparency and Cornerstyle ///'
+   printlog "Remove the Shaddow, Transparency and Cornerstyle"
    FormatArea
       Kontext
       Messagebox.SetPage TabTransparenz
@@ -421,14 +421,14 @@ testcase tiShaddow
          KeineTransparenz.Check
       sleep 1
       kontext "TabArea"
-         '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue ///'
+         printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue"
          Kontext
          active.SetPage TabSchatten
          kontext "TabSchatten"
          Anzeigen.UnCheck
      TabSchatten.Ok
 
-   '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///'
+   printlog "If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file."
     if (gApplication = "IMPRESS") then
         ExtensionString = "ppt"
     else
@@ -454,19 +454,19 @@ testcase tiShaddow
          printlog "Saved as: " + sFileName
       Sleep 3
 
-   '/// Close the office-session ///'
+   printlog "Close the office-session"
    FileClose
       Kontext "Messagebox"
       if Messagebox.Exists(2) then Messagebox.Yes
    Sleep 3
-   '/// Open the saved file ///'
+   printlog "Open the saved file"
    hFileOpen (sFileName + "." + ExtensionString)
    printlog "File opened: " + sFileName + "." + ExtensionString
    Sleep 3
-   '/// Select all ///'
+   printlog "Select all"
    EditSelectAll
 
-   '/// Check the attributes for the picture ///'
+   printlog "Check the attributes for the picture"
    hOpenContextmenu
       sleep(2)
       if hMenuFindSelect(10087, true, 1) = false then
@@ -474,7 +474,7 @@ testcase tiShaddow
          Call hCloseDocument
          Goto Endsub
       endif
-      'Select "Position and Size"
+      printlog "Select Position and Size"
       sleep(2)
       Kontext
       Active.SetPage TabPositionAndSize
@@ -483,7 +483,7 @@ testcase tiShaddow
       if ImageHeight <> Height.GetText then warnlog "Position X differs. Should be: " + ImageHeight + " But is: " + Height.GetText
       TabPositionAndSize.OK
 
-   '/// Check if transparency has disappeared ///'
+   printlog "Check if transparency has disappeared "
    FormatArea
       Kontext
       Messagebox.SetPage TabTransparenz
@@ -495,7 +495,7 @@ testcase tiShaddow
          end if
    TabTransparenz.Cancel
 
-   '/// Check if the cornerstyle has changed via FormatLine ///'
+   printlog "Check if the cornerstyle has changed via FormatLine "
    FormatLine
       Kontext
       Messagebox.SetPage TabLinie
@@ -506,7 +506,7 @@ testcase tiShaddow
          if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText
       TabLinie.ok
 
-   '/// Close application ///'
+   printlog "Close application"
    Call hCloseDocument
    Printlog "Finished Shaddow-test for " + gApplication
    
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index e1f02de039cc..bd9cf36bb814 100644
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -100,6 +100,133 @@ testcase tiToolsSpellcheckCheck_AlwaysIgnore
     kill (convertPath(gOfficePath+"user/work/"+"recht_"+iSprache+sExt))
 endcase 'tiToolsSpellcheckCorrect
 
+'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+testcase tiToolsSpellcheckError
+    if iSprache = 48 then
+        qaerrorlog "This test is not adapted for polish, 48."
+        got endsub
+    endif
+    Dim Fehler$
+    Dim Sprachenname$
+    Dim Dummy$
+    Dim FehlerText$
+    Dim i as integer
+
+    printlog "New document"
+    Call hNewDocument
+    printlog "Selecting language case: " & iSprache
+    select case iSprache
+    case 01 : FehlerText$ = "Thatt is a failure test."                      : Fehler$ = "Thatt" : Sprachenname$ = "English (US)"
+    case 34 : FehlerText$ = "Ezte es un chico muy importante."              : Fehler$ = "Ezte"  : Sprachenname$ = "Niederlaendisch"
+    case 33 : FehlerText$ = "Ler nous faut donc un de temps pour examiner." : Fehler$ = "Ler"   : Sprachenname$ = "Franzoesisch"
+    case 36 : FehlerText$ = "Boszniai americkai kontingens háromnegyedesek – mintegy négyezer katona – magyarországi telepítése egy éven belül megtörténhet" : Fehler$ = "tellepítésel"   : Sprachenname$ = "Ungarisch"
+    case 39 : FehlerText$ = "Ringrarziamo per l'interessa mostrato a collaborare con la firma." : Fehler$ = "Ringrarziamo" : Sprachenname$ = "Italienisch"
+    case 46 : FehlerText$ = "Detd varierar vad som behandlas och ur vilket perspektiv."         : Fehler$ = "Detd"         : Sprachenname$ = "Schwedisch"
+    case 49 : FehlerText$ = "Diees ist ein Fehler."                         : Fehler$ = "Diees" : Sprachenname$ = "Deutsch"
+    case 50 : FehlerText$ = "Toje napaka, ker manjka presledek."            : Fehler$ = "Toje" : Sprachenname$ = "Slovenš�?ina"
+    case 55 : FehlerText$ = "Eesta poderia ser a resposta para suas preces?": Fehler$ = "Eesta" : Sprachenname$ = "Portugiesisch"
+    case else :
+        if bAsianLan then
+            printlog "For the language  " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-) using english"
+            FehlerText$ = "Thatt is a failure test."
+            Fehler$ = "Thatt"
+            Sprachenname$ = "English (US)"
+            call hSetSpellHypLanguage
+        else
+            Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here"
+        end if
+    end select
+    printlog "Error Text taken for testing is: " & FehlerText$
+    sleep 2
+
+    printlog "Delete ignore word list"
+    if (not wIgnorierenlisteLoeschen) then
+        qaErrorLog "Can't get into Dictionary lists"
+        goto endsub
+    end if
+    printlog "Setting doc language to english"
+    ToolsOptions
+    Kontext "ExtrasOptionenDlg"
+    hToolsOptions("LANGUAGESETTINGS","Languages")
+    Westlich.Select 34
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
+    printlog "Create 1 textbox with 1 spelling error (test replace always)"
+    hTextrahmenErstellen (FehlerText$,30,30,90,40)
+
+    hTypeKeys "<HOME>"
+    printlog "Call 'Tools->Spellcheck->Check'"
+    ToolsSpellcheck
+    printlog "Spellcheck dialog has to come up, wrong word is selected."
+    Kontext "Spellcheck"
+    if Spellcheck.Exists then
+        printlog "There has to be at least ONE suggestion."
+        if (Suggestions.GetItemCount < 1) then
+            printlog "If no suggestion avilable:"
+            warnlog "   - no suggestion for the language: "+DictionaryLanguage.GetSelIndex+" '"+DictionaryLanguage.GetSelText+"' , press check button..."
+            printlog "+ press button 'Check word'"
+            Pruefen.click
+            if (Suggestions.GetItemCount < 1) then
+                warnlog " STILL no suggestions :-( errors will follow "
+            else
+                printlog "   - now suggestion for the language: "+DictionaryLanguage.GetSelIndex+" '"+DictionaryLanguage.GetSelText+"'" + Suggestions.GetItemCount
+            end if
+        end if
+        Dummy$=Suggestions.GetItemText (1)
+        printlog "Select first spellcheck suggestion (click it!)."
+        Suggestions.Select (1)
+        printlog "Check if textfield 'word' has changed to selected word."
+        if (Suggestions.GetSelText <> Dummy$) Then
+            Warnlog "Suggestion not used"
+        else
+            Printlog "Suggestion is used"
+        end if
+        sleep 1
+        kontext "Spellcheck"
+        printlog "click button 'Always replace'"
+        ChangeAll.Click
+        printlog "spellcheck dialog has to disappear and"
+        printlog "There has to come up only one active: 'Spellcheck of entire document has been completed [OK]'"
+        Kontext "Active"
+        if Active.Exists(5) then
+            Printlog "Message: Spellchecking has finished?: '" + active.gettext + "'"
+            Active.OK
+        else
+            Printlog "'Change All' seems to have worked correctly."
+            Kontext "Spellcheck"
+            Spellcheck.Close
+            Kontext "Active"
+            if active.exists(5) then
+                Printlog "Spellcheck dialog closed'" + active.gettext + "'"
+                Active.OK
+            else
+                Printlog "Spellcheck dialog closed'"
+            end if
+        end if
+    else
+        Warnlog "  Error not recognized by the Spellchecker"
+        if active.exists(5) then
+            Kontext "Active"
+            printlog "Message: spellchecking has finished?: '" + active.gettext + "'"
+            Active.OK
+        end if
+    end if
+
+    printlog "Close dialog 'Edit Custom Dictionary'."
+    BenutzerwoerterbuchBearbeiten.Close
+    Kontext "ExtrasOptionenDlg"
+    printlog "Close the Option dialog."
+    ExtrasOptionenDlg.OK
+
+    printlog "Close document"
+    Call hCloseDocument
+
+    ' remove the word again from the dictionary
+    delete_word_from_dictionary(sWrongWord,"IgnoreAllList")
+
+    kill (convertPath(gOfficePath+"user/work/"+"recht_"+iSprache+sExt))
+endcase 'tiToolsSpellcheckCorrect
+
 '-------------------------------------------------------------------------------
 testcase tiToolsSpellcheckCheck_Change
 
diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc
index f09e6c0fd433..71d05f7d704c 100644
--- a/testautomation/graphics/optional/includes/global/g_stylist.inc
+++ b/testautomation/graphics/optional/includes/global/g_stylist.inc
@@ -38,17 +38,18 @@ testcase tFormatStylistFlyer
     Dim ySize%
 
     printlog "   - Format/Stylist : using all possible things to manipulate the flyer"
-    '/// open application ///'
+    printlog "open application"
     Call  hNewDocument
     Kontext "Gestalter"
-    '/// Check if stylist is there. Expected: not there ///'
+    printlog "Check if stylist is there. Expected: not there"
     if Gestalter.NotExists = false Then
-        qaErrorLog "   - Expected Stylist to be closed; But is Open. Check tests."
+        qaErrorLog "Expected Stylist to be closed; But is Open. Check tests."
     else
         if lcase(gPlatform) = "osx" then
             hTypekeys "<mod1 t>"
         else
-            hTypekeys "<F11>"   '/// open stylist by pressing key [F11] ///'
+            printlog "open stylist by pressing key [F11]"
+            hTypekeys "<F11>"   
         end if
         sleep 1
     end if
@@ -57,51 +58,51 @@ testcase tFormatStylistFlyer
         Warnlog "   No stylist popped up using F11; opening now via slotID"
         FormatStylist
     end if
-    '///+ save stylist position and size ///'
+    printlog "save stylist position and size"
     xPos% = Gestalter.GetPosX
     yPos% = Gestalter.GetPosY
     xSize% = Gestalter.GetSizeX
     ySize% = Gestalter.GetSizeY
-    '///+ if Stylist is docked; undock ///'
+    printlog " if Stylist is docked; undock"
     if Gestalter.IsDocked then Gestalter.UnDock
-    printlog "  -   '///move stylist ///"
-    '///+ move stylist to 10,10 ///'
+    printlog " move stylist"
+    printlog "move stylist to 10,10"
     Gestalter.Move 10, 10
     Sleep 1
-    '///+ move stylist to 300,400 ///'
+    printlog "move stylist to 300,400"
     Gestalter.Move 300, 400
     Sleep 1
-    '///+ move stylist to 590,790 ///'
+    printlog "move stylist to 590,790"
     Gestalter.Move 590, 790
     Sleep 1
-    '///+ move stylist back to saved start position ///'
+    printlog " move stylist back to saved start position"
     Gestalter.Move xPos%, yPos%
     Sleep 1
 
-    printlog "  -   '///size stylist ///"
-    '///+ change size to 200,200 ///'
+    printlog "size stylist"
+    printlog "change size to 200,200"
     Gestalter.Size 200, 200
     Sleep 1
-    '///+ change size to 300,400 ///'
+    printlog "change size to 300,400"
     Gestalter.Size 300, 400
     Sleep 1
-    '///+ change size to 150,250 ///'
+    printlog "change size to 150,250"
     Gestalter.Size 150, 250
     Sleep 1
-    '///+ change size back to saved size ///'
+    printlog "change size back to saved size"
     Gestalter.Size xSize%, ySize%
     Sleep 1
 
-    printlog "  -   Close stylist reopen stylist, check if appearence is same as before"
-    '/// save stylist position and size ///'
+    printlog "Close stylist reopen stylist, check if appearence is same as before"
+    printlog "save stylist position and size"
     xPos% = Gestalter.GetPosX
     yPos% = Gestalter.GetPosY
     xSize% = Gestalter.GetSizeX
     ySize% = Gestalter.GetSizeY
-    '/// close stylist Format->Stylist ///'
+    printlog "close stylist Format->Stylist"
     FormatStylist
     Sleep 1
-    '/// open stylist Format->Stylist ///'
+    printlog "open stylist Format->Stylist"
     FormatStylist
     sleep (1)
     if xPos% <> Gestalter.GetPosX then Warnlog "The x-Pos. has changed : Should be -> '"+ xPos% +  "'  Is -> '"+ Gestalter.GetPosX  +"'."
@@ -110,29 +111,29 @@ testcase tFormatStylistFlyer
     if ySize% <> Gestalter.GetSizeY then Warnlog "The y-Size has changed : Should be -> '"+ ySize% + "'  Is -> '"+ Gestalter.GetSizeY +"'."
 
     printlog "  -   dock stylist"
-    '/// dock stylist ///'
+    printlog "dock stylist"
     Gestalter.Dock
     Sleep 1
     if (NOT Gestalter.IsDocked) then
         warnlog "   stylist not docked but should"
     endif
-    '/// UNdock stylist ///'
+    printlog "UNdock stylist"
     if (Gestalter.IsDocked) Then
         Gestalter.UnDock
     endif
     Sleep 1
 
     printlog "  -   maximize/minimize stylist"
-    '/// minimize stylist ///'
+    printlog "minimize stylist"
     Gestalter.Minimize
     Sleep 1
-    '/// maximize stylist ///'
+    printlog "maximize stylist"
     Gestalter.Maximize
     Sleep 1
     if (NOT Gestalter.IsMax) then
         warnlog "   The stylist did not return to maximized state"
     endif
-    '/// close stylist ///'
+    printlog "close stylist"
     Gestalter.Close
     Call  hCloseDocument
 
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 410ed8ca0fc6..10774ab43d76 100644
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -44,10 +44,12 @@ testcase tiInsertTableUsingMenu
     Call hNewDocument
     printlog "Switching between Draw/Impress"
     if ( gApplication = "IMPRESS" ) then
+        Kontext "Document Impress"
         DocumentImpress.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(14)
     else
+        Kontext "Document Draw"
         DocumentDraw.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(11)
@@ -208,9 +210,11 @@ testcase tiTableObjectBar
     printlog "Switching between Draw/Impress"
     if ( gApplication = "IMPRESS" ) then
         DocumentImpress.UseMenu
+        Kontext "Document Impress"
         hMenuSelectNr(4)
         hMenuSelectNr(14)
     else
+        Kontext "Document Draw"
         DocumentDraw.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(11)
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 7b9ce82860d2..9faee3508c1b 100644
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -92,8 +92,7 @@ testcase tiToolsThesaurus
     case 90 : Printlog "- No Thesaurus available !"
         goto endsub
 
-    case else
-        if bAsianLan then
+    case else : if bAsianLan then
             hSetSpellHypLanguage
             sWord = "Hello"
         else
@@ -152,7 +151,7 @@ testcase tiToolsThesaurus
             endif
 
             if ( ReplaceWith.getText() <> sAlternativeText ) then
-                warnlog "the text is no transfered to the ReplaceWith field. " +"ReplaceWith = "  + ReplaceWith.getText() + ", Alternative = " + sAlternativeText
+                warnlog "the text is no transfered to the ReplaceWith field. " + "ReplaceWith = "  + ReplaceWith.getText() + ", Alternative = " + sAlternativeText
             else
                 printlog "the text is transfered to the ReplaceWith field."
             endif
@@ -162,9 +161,9 @@ testcase tiToolsThesaurus
         endif
         Thesaurus.OK
 
-        if( gApplication = "DRAW" ) then
+        if(gApplication = "DRAW") then
             Kontext "Draw"
-        elseif( gApplication = "IMPRESS") then
+        elseif(gApplication = "IMPRESS") then
             Kontext "Impress"
         else ' fallback
             warnlog "gApplication is wrong"
@@ -186,7 +185,7 @@ testcase tiToolsThesaurus
 
     Call hCloseDocument
 
-endcase
+endcase 'tiToolsThesaurus
 '-------------------------------------------------------------------------------
 testcase tiToolsThesaurusWithoutText
 
@@ -209,7 +208,7 @@ testcase tiToolsThesaurusWithoutText
     Call hCloseDocument
 
 
-endcase
+endcase 'tiToolsThesaurusWithoutText
 '-------------------------------------------------------------------------------
 testcase tiToolsThesaurusContextMenu
 
@@ -266,8 +265,7 @@ testcase tiToolsThesaurusContextMenu
     case 90 : Printlog "- No Thesaurus available !"
         goto endsub
 
-    case else
-        if bAsianLan then
+    case else : if bAsianLan then
             hSetSpellHypLanguage
             sWord = "Hello"
         else
@@ -306,62 +304,64 @@ testcase tiToolsThesaurusContextMenu
 
     call hCloseDocument
 
-endcase
+endcase 'tiToolsThesaurusContextMenu
 '-------------------------------------------------------------------------------
 testcase tiToolsHyphenation1
 
-    printlog "   - Hyphenation without any text"
-    Call hNewDocument									'/// New impress document ///'
-    sleep 3
-    ToolsLanguageHyphenationDraw								'/// Try  with empty document ///'
-    Kontext "Hyphenation"
+   printlog "   - Hyphenation without any text"
+   printlog "New impress document "
+   Call hNewDocument									
+   sleep 3
+   ToolsLanguageHyphenationDraw								
+   Kontext "Hyphenation"
+    printlog "Try with empty document"
     if Hyphenation.Exists(1) = True Then
         Warnlog "  - Dialog ist da"
         Hyphenation.Cancel
     else
         Printlog "  - Hyphenation activated"
     end if
-    '   Kontext "DocumentImpress"
-    printlog "   - Hyphenation with text, but without any possibility to break words"
-    select case iSprache
-    case 01 : hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40)	'/// Create text without a pssibility to split words///'
-    case 03 : hTextrahmenErstellen ("Compare a tradu" + Chr(231) + Chr(227) + "o com o original",10,10,40,40)
-    case 07 : qaerrorlog "- No Hypenation for Russian available"
-        Call hCloseDocument                    '/// Close document ///'
-        goto endsub
-    case 31 : hTextrahmenErstellen ("Het is mijn bedoeling om voor en hulpmiddel.",10,10,40,40)
-    case 33 : hTextrahmenErstellen ("Merci beaucoup pout votre candidature du 13/11/97.",10,10,40,40)
-    case 34 : hTextrahmenErstellen ("This ist a text with no spliting words",10,10,40,40)
-    case 36 : hTextrahmenErstellen ("Semmi karhozattyoc nincz most azoknac, a kic az Iesus Christusban be oltattac",10,10,40,40)
-    case 39 : hTextrahmenErstellen ("Il documento 'Senza nome 1' stato modififcato",10,10,40,40)
-    case 45 : hTextrahmenErstellen ("at du har nok i dit hvis du",10,10,40,40 )
-    case 46 : hTextrahmenErstellen ("Detta är en text utan delade ord",10,10,40,40)
-    case 48 : hTextrahmenErstellen (" Jeoli jednak zechcesz",10,10,40,40)
-    case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne eine Moeglichkeit Woerter zu trennen",10,10,40,40)
-    case 50 : hTextrahmenErstellen ("Zato ves �?as iš�?emo nove �?lane: sodelujte",10,10,40,40)
-    case 55 : hTextrahmenErstellen ("a Sun tentou adquirir a Apple",10,10,40,40)
-    case else
-        if bAsianLan then
-            printlog "For the language  " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)"
-            printlog " :-) will use English instead"
-            hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40)
-        else
-            Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here"
-        endif
-    end select
-    hTypeKeys "<Home>"
-    ToolsLanguageHyphenationDraw								'/// Try  ///'
-    Kontext "Hyphenation"
-    if Hyphenation.Exists =True Then
-        Warnlog "Dialog exists"
-        Hyphenation.Cancel
-    else
-        Kontext "Active"
-        if Active.Exists then Active.OK
-    end if
-
-    Call hCloseDocument 										'/// Close document ///'
-
+'   Kontext "DocumentImpress"
+   printlog "   - Hyphenation with text, but without any possibility to break words"
+   select case iSprache
+       case 01 : hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40)	
+       case 03 : hTextrahmenErstellen ("Compare a tradu" + Chr(231) + Chr(227) + "o com o original",10,10,40,40)
+       case 07 : qaerrorlog "- No Hypenation for Russian available"
+                printlog "Close document"
+                 Call hCloseDocument                    
+                 goto endsub
+       case 31 : hTextrahmenErstellen ("Het is mijn bedoeling om voor en hulpmiddel.",10,10,40,40)
+       case 33 : hTextrahmenErstellen ("Merci beaucoup pout votre candidature du 13/11/97.",10,10,40,40)
+       case 34 : hTextrahmenErstellen ("This ist a text with no spliting words",10,10,40,40)
+       case 36 : hTextrahmenErstellen ("Semmi karhozattyoc nincz most azoknac, a kic az Iesus Christusban be oltattac",10,10,40,40)
+       case 39 : hTextrahmenErstellen ("Il documento 'Senza nome 1' stato modififcato",10,10,40,40)
+       case 45 : hTextrahmenErstellen ("at du har nok i dit hvis du",10,10,40,40 )
+       case 46 : hTextrahmenErstellen ("Detta är en text utan delade ord",10,10,40,40)
+       case 48 : hTextrahmenErstellen (" Jeoli jednak zechcesz",10,10,40,40)
+       case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne eine Moeglichkeit Woerter zu trennen",10,10,40,40)
+       case 50 : hTextrahmenErstellen ("Zato ves �?as iš�?emo nove �?lane: sodelujte",10,10,40,40)
+       case 55 : hTextrahmenErstellen ("a Sun tentou adquirir a Apple",10,10,40,40)
+       case else : if bAsianLan then
+                     printlog "For the language  " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)"
+                     printlog " :-) will use English instead"
+                     hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40)
+                  else
+                     Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here"
+                  endif
+   end select
+   hTypeKeys "<Home>"
+   ToolsLanguageHyphenationDraw							
+   Kontext "Hyphenation"
+   if Hyphenation.Exists =True Then
+      Warnlog "Dialog exists"
+      Hyphenation.Cancel
+   else
+      Kontext "Active"
+      if Active.Exists then Active.OK
+   end if
+   printlog "Close document "
+   Call hCloseDocument 										
+   
 endcase 'tiToolsHyphenation1
 
 '-------------------------------------------------------------------------------
@@ -381,55 +381,61 @@ testcase tiToolsHyphenation2
 
     if ((not bAsianLan) AND (iSprache <> 07)) then
         sFile = gTesttoolpath + "graphics\required\input\silben_"+iSprache+sExt
-        hFileOpenLocally( sFile )
+        Call hFileOpenLocally( sFile )
     endif
 
-    select case iSprache					'/// Open prepared document ///'
-    case 01 :DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on"  '+Chr(34)
-    case 07 : qaerrorlog "- No Hypenation for Russian available"
-        goto endsub
-    case 31 :DasWort = "siteit" : DasWort2 = "iteit" : DasWort3 = "teit" : DasWort4 = "eit"
-    case 33 :DasWort = "ture" : DasWort2 = "ure" : DasWort3 = "re" : DasWort4 = "e"
-    case 34 :DasWort = "chvo" : DasWort2 = "hvo" : DasWort3 = "vo" : DasWort4 = "o"
-    case 36 :DasWort = "zatnal" : DasWort2 = "atnal" : DasWort3 = "tnal" : DasWort4 = "nal"
-    case 39 :DasWort = "sentu" : DasWort2 = "entu" : DasWort3 = "ntu" : DasWort4 = "tu"
-    case 46 :DasWort = "niska" : DasWort2 = "iska" : DasWort3 = "ska" : DasWort4 = "ka"
-    case 48 :DasWort = "nie" : DasWort2 = "ie" : DasWort3 = "e"
-    case 49 :DasWort = "nung" : DasWort2 = "ung" : DasWort3 = "ng" : DasWort4 = "g"
-    case 50 :DasWort = "nica" : DasWort2 = "ica" : DasWort3 = "ca" : DasWort4 = "a"
-    case 55 :DasWort = "gia" : DasWort2 = "ia" : DasWort3 = "a" : DasWort4 = "ogia"
-    case else
-        if bAsianLan then
-            printlog "For the language  " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)"
-            printlog " :-) will use English instead"
-            hFileOpenLocally( gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt )
-            DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on"  '+Chr(34)
-        else
-            Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here and create file: "+sFile
-            hNewDocument
-        endif
-    end select
-
-    printlog "   - Test hyphenation"
-    EditSelectAll '/// Press CTRL + A to select all ///'
-    '/// press return to go into the edit mode ///'
-    hTypeKeys "<Return>"
+   select case iSprache					
+       case 01 :DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on"  '+Chr(34)
+       case 07 : qaerrorlog "- No Hypenation for Russian available"
+                 goto endsub
+       case 31 :DasWort = "siteit" : DasWort2 = "iteit" : DasWort3 = "teit" : DasWort4 = "eit"
+       case 33 :DasWort = "ture" : DasWort2 = "ure" : DasWort3 = "re" : DasWort4 = "e"
+       case 34 :DasWort = "chvo" : DasWort2 = "hvo" : DasWort3 = "vo" : DasWort4 = "o"
+       case 36 :DasWort = "zatnal" : DasWort2 = "atnal" : DasWort3 = "tnal" : DasWort4 = "nal"
+       case 39 :DasWort = "sentu" : DasWort2 = "entu" : DasWort3 = "ntu" : DasWort4 = "tu"
+       case 46 :DasWort = "niska" : DasWort2 = "iska" : DasWort3 = "ska" : DasWort4 = "ka"
+       case 48 :DasWort = "nie" : DasWort2 = "ie" : DasWort3 = "e"
+       case 49 :DasWort = "nung" : DasWort2 = "ung" : DasWort3 = "ng" : DasWort4 = "g"
+       case 50 :DasWort = "nica" : DasWort2 = "ica" : DasWort3 = "ca" : DasWort4 = "a"
+       case 55 :DasWort = "gia" : DasWort2 = "ia" : DasWort3 = "a" : DasWort4 = "ogia"
+       case else : if bAsianLan then
+             printlog "For the language  " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)"
+             printlog " :-) will use English instead"
+             printlog "Open prepared document"
+             Call hFileOpen (gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt)
+             DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on"  '+Chr(34)
+          else
+             Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here and create file: "+sFile
+             hNewDocument
+          endif
+   end select
+
+  printlog "Test hyphenation"
+printlog "Press CTRL + A to select all"
+   EditSelectAll 
+   printlog "press return to go into the edit mode"
+   hTypeKeys "<Return>"
+
+   sleep 1
+   ' WA for draw, or smth else: get text part before hyphenation:
+   if iSprache = "1" OR bAsianLan = TRUE then
+    printlog "Select part of text and compare it with original text at this place"
+      hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT RIGHT>"      
+   else
+      hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>"
+   endif
+   EditCopy
+   sDraw = GetClipboardText()
+   printlog "Select whole text"
+   EditSelectAll
+   printlog "Run Hyphenation"
+   ToolsLanguageHyphenationDraw					
+   gMouseClick 50,50
+   printlog "Select part of text and compare it with original text at this place"
+   hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>"		
+   sleep 3
+   EditCopy
 
-    sleep 1
-    ' WA for draw, or smth else: get text part before hyphenation:
-    if iSprache = "1" OR bAsianLan = TRUE then
-        hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT RIGHT>"      '/// Select part of text and compare it with original text at this place ///'
-    else
-        hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>"
-    endif
-    EditCopy
-    sDraw = GetClipboardText()
-    EditSelectAll						'/// Select whole text ///'
-    ToolsLanguageHyphenationDraw					'/// Run Hyphenation ///'
-    gMouseClick 50,50
-    hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>"		'/// Select part of text and compare it with original text at this place ///'
-    sleep 3
-    EditCopy
     printlog GetClipboardText
     select case GetClipboardText
     case DasWort  : printlog "  - Hyphenation worked"
@@ -444,9 +450,10 @@ testcase tiToolsHyphenation2
         Warnlog "  - Hyphenation did not work"
         Printlog "Expected: '"+DasWort+"'; or something different than: '"+sDraw+"'; But what we got was: '"+GetClipboardText+"'"
     end if
-    sleep 1
-    Call hCloseDocument						'/// Close document ///'
-
+   sleep 1
+   printlog "Close document"
+ Call hCloseDocument						
+ 
 endcase 'tiToolsHyphenation2
 
 '-------------------------------------------------------------------------------
@@ -462,7 +469,7 @@ testcase tToolsMacro
     ToolsMacro
     Kontext "Makro"
 
-    '/// to get the count of all macros, the list needs to get elapsed-all ///'
+    printlog "to get the count of all macros, the list needs to get elapsed-all"
     for j = 1 to 2
         Zaehler=MakroAus.GetItemCount
         MakroAus.typeKeys "<end>"
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc.orig b/testautomation/graphics/optional/includes/global/g_tools.inc.orig
deleted file mode 100644
index 9dc207b481b9..000000000000
--- a/testautomation/graphics/optional/includes/global/g_tools.inc.orig
+++ /dev/null
@@ -1,586 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/************************************************************************
-'*
-'* Owner : wolfram.garten@oracle.com
-'*
-'* short description : will be moved to autocorrection.bas/inc
-'*
-'\*************************************************************************************
-'   sFile = gTesttoolpath + "graphics\required\input\silben_"+iSprache+sExt
-
-'-------------------------------------------------------------------------------
-testcase tiToolsThesaurus
-
-    Dim sWord as string
-    Dim sChangedWord as string
-    Dim sReplaceWord as string
-    Dim sAlternativeText as string
-    Dim sExt as string
-    Dim ZaehlerBedeutung
-    dim sWorkFile as string
-
-    'for normal text, the thesaurus is enabled,
-    'if the format->character->language of the word has a thesaurus
-    'unfortunately in textboxes this doesn't work, you can give the word a langauge,
-    'but this is been ignored by our thesaurus
-    'so especially for asian languages you have to set a default language in the options,
-    'to be able to use the thesaurus there - fallback to englisch,
-    'because there is no thesaurus for cjk languages
-    
-    'As long as OOo has no modules for that, disabled
-    if gOOO = True then
-        printlog "No spellchecking in OOo"
-        goto endsub
-    endif
-
-    'First we make sure we test a language where Thesaurus
-    select case iSprache
-       case 01 : sWord = "Hello"
-       case 03 : sWord = "Alo"
-       case 07 : printlog "- No Thesaur for Russian available"
-                 goto endsub
-       case 30 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 31 : sWord = "Guiten"
-       case 33 : sWord = "Bonjour"
-       case 34 : sWord = "Hola"
-       case 35 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 36 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 37 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 39 : sWord = "Ciao"
-       case 42 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 45 : sWord = "Hej"
-       case 46 : sWord = "Välkommen"
-       case 47 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 48 : Printlog "- No Thesaurus in Polish!"
-                 goto endsub
-       case 49 : sWord = "Hallo"
-       case 50 : sWord = "Prosojnica"
-       case 51 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 55 : Printlog "- No Thesaurus in Brazilian!"
-                 goto endsub
-       case 90 : Printlog "- No Thesaurus available !"
-                 goto endsub
-
-       case else : if bAsianLan then
-                     hSetSpellHypLanguage
-                     sWord = "Hello"
-                  else
-                     Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here"
-                     sWord = "Hello"
-                  endif
-    end select
-    
-    PrintLog "Thesaurus with 1 word: " + sWord
-
-    if( gApplication = "DRAW" ) then
-        sExt = ".odg"
-    elseif( gApplication = "IMPRESS" ) then
-        sExt = ".odp"
-    endif
-
-    sWorkFile = gTesttoolPath & "graphics\required\input\recht_" & iSprache & sExt
-    hFileDelete( sWorkFile )
-
-    Call hFileOpenLocally( sWorkFile )
-    Call hTextrahmenErstellen (sWord,20,20,50,30)
-    sleep 1
-
-    printlog "select the word"
-    hTypeKeys "<Home><SHIFT END>"
-    
-    try
-        ExtrasThesaurusDraw
-    catch
-        warnlog "No Thesaurus available."
-        hCloseDocument()
-        goto endsub
-    endcatch
-
-    Kontext "Thesaurus"
-    if Thesaurus.Exists(3) then
-
-        if CurrentWord.GetSelText <> sWord Then
-            WarnLog "marked word should be:" + sWord + " but it is:" + CurrentWord.GetSelText
-        else
-            PrintLog "Marked word is correctly changed"
-        endif
-
-        if Alternatives.GetItemCount = 0 Then
-            warnlog "There are no alternative for this word"
-            sleep 1
-        else
-            printlog "select the first alternative"
-            Alternatives.Select 1
-
-            printlog "check if the selected alternative apprear in the ReplaceWith field."
-
-            sAlternativeText = Alternatives.getSeltext(1,3)
-            'remove the part in the () if there is any
-            if( Instr(sAlternativeText, "(") <> 0 ) then
-                sAlternativeText = left(sAlternativeText, Instr(sAlternativeText, "(") - 2 )
-            endif
-
-            if ( ReplaceWith.getText() <> sAlternativeText ) then
-                warnlog "the text is no transfered to the ReplaceWith field. " +_
-                "ReplaceWith = "  + ReplaceWith.getText() + ", Alternative = " + sAlternativeText
-            else
-                printlog "the text is transfered to the ReplaceWith field."
-            endif
-
-            sReplaceWord = ReplaceWith.getText()
-            sleep 1
-        endif
-        Thesaurus.OK
-
-        if( gApplication = "DRAW" ) then
-            Kontext "Draw"
-        elseif( gApplication = "IMPRESS") then
-            Kontext "Impress"
-        else ' fallback
-            warnlog "gApplication is wrong"
-            goto endsub
-        endif
-
-        hTypeKeys "<Home><SHIFT END>"
-        EditCopy
-        sChangedWord = getClipboard()
-        printlog "sChangedWord = " + sChangedWord
-        if(sChangedWord <> sReplaceWord) then
-            warnlog "the text was not replaced"
-        else
-            printlog "the text was successfull replaced"
-        endif
-    else
-        warnlog "thesaurus didn't come up."
-    end if
-    
-    Call hCloseDocument
-
-endcase
-'-------------------------------------------------------------------------------
-testcase tiToolsThesaurusWithoutText
-
-    printlog "Thesaurus without any word in the document"
-    Call hNewDocument
-    try
-        ExtrasThesaurusDraw
-    catch
-        printlog "the Thesaurus is correctly not available"
-        call hCloseDocument
-        goto endsub
-    endcatch
-
-    WarnLog "If no word is in the document, Thesaurus shouldn't be available"
-    Kontext "Thesaurus"
-    if Thesaurus.Exists then
-        Thesaurus.Cancel
-    endif
-
-    Call hCloseDocument
-    
-
-endcase
-'-------------------------------------------------------------------------------
-testcase tiToolsThesaurusContextMenu
-
-    Dim sWord as string
-    Dim sExt as string
-    Dim iItemCount as Integer
-
-    'for normal text, the thesaurus is enabled,
-    'if the format->character->language of the word has a thesaurus
-    'unfortunately in textboxes this doesn't work, you can give the word a langauge,
-    'but this is been ignored by our thesaurus
-    'so especially for asian languages you have to set a default language in the options,
-    'to be able to use the thesaurus there - fallback to englisch,
-    'because there is no thesaurus for cjk languages
-
-    'As long as OOo has no modules for that, disabled
-    if gOOO = True then
-        printlog "No spellchecking in OOo"
-        goto endsub
-    endif
-
-    'First we make sure we test a language where Thesaurus
-    select case iSprache
-       case 01 : sWord = "Hello"
-       case 03 : sWord = "Alo"
-       case 07 : printlog "- No Thesaur for Russian available"
-                 goto endsub
-       case 30 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 31 : sWord = "Guiten"
-       case 33 : sWord = "Bonjour"
-       case 34 : sWord = "Hola"
-       case 35 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 36 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 37 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 39 : sWord = "Ciao"
-       case 42 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 45 : sWord = "Hej"
-       case 46 : sWord = "Välkommen"
-       case 47 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 48 : Printlog "- No Thesaurus in Polish!"
-                 goto endsub
-       case 49 : sWord = "Hallo"
-       case 50 : sWord = "Prosojnica"
-       case 51 : Printlog "- No Thesaurus available !"
-                 goto endsub
-       case 55 : Printlog "- No Thesaurus in Brazilian!"
-                 goto endsub
-       case 90 : Printlog "- No Thesaurus available !"
-                 goto endsub
-
-       case else : if bAsianLan then
-                     hSetSpellHypLanguage
-                     sWord = "Hello"
-                  else
-                     Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here"
-                     sWord = "Hello"
-                  endif
-    end select
-
-    PrintLog "Thesaurus with 1 word: " + sWord
-
-    if( gApplication = "DRAW" ) then
-        sExt = ".odg"
-        Kontext "DrawDocument"
-    elseif( gApplication = "IMPRESS" ) then
-        sExt = ".odp"
-        Kontext "ImpressDocument"
-    endif
-
-    hFileOpenLocally(gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt)
-    Call hTextrahmenErstellen (sWord,20,20,50,30)
-    sleep 1
-
-    printlog "select the word"
-    hTypeKeys "<Home><SHIFT END>"
-    
-    hOpenContextMenu
-
-    hMenuSelectNr(14) ' the synonyms
-    iItemCount = hMenuItemGetCount
-    printlog iItemCount
-    if(iItemCount <= 2 ) then ' none and Thesaurus item
-        warnlog "There should be a synonymus display for the word '" + sWord + "' but it isn't."
-    endif
-
-    hMenuSelectNr(iItemCount) ' the last item
-
-    Kontext "Thesaurus"
-    if Thesaurus.Exists(5) then
-        printlog "Thesaurus dialog appear from the context menu"
-        Thesaurus.Cancel
-    else
-        warnlog "the thesaurus dialog does not appear fro mthe context menu of a selected word"
-    endif
-
-    call hCloseDocument
-
-endcase
-'-------------------------------------------------------------------------------
-testcase tiToolsHyphenation1
-
-   printlog "   - Hyphenation without any text"
-   Call hNewDocument									'/// New impress document ///'
-   sleep 3
-   ToolsLanguageHyphenationDraw								'/// Try  with empty document ///'
-   Kontext "Hyphenation"
-    if Hyphenation.Exists(1) = True Then
-       Warnlog "  - Dialog ist da"
-       Hyphenation.Cancel
-    else
-       Printlog "  - Hyphenation activated"
-    end if
-'   Kontext "DocumentImpress"
-   printlog "   - Hyphenation with text, but without any possibility to break words"
-   select case iSprache
-       case 01 : hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40)	'/// Create text without a pssibility to split words///'
-       case 03 : hTextrahmenErstellen ("Compare a tradu" + Chr(231) + Chr(227) + "o com o original",10,10,40,40)
-       case 07 : qaerrorlog "- No Hypenation for Russian available"
-                 Call hCloseDocument                    '/// Close document ///'
-                 goto endsub
-       case 31 : hTextrahmenErstellen ("Het is mijn bedoeling om voor en hulpmiddel.",10,10,40,40)
-       case 33 : hTextrahmenErstellen ("Merci beaucoup pout votre candidature du 13/11/97.",10,10,40,40)
-       case 34 : hTextrahmenErstellen ("This ist a text with no spliting words",10,10,40,40)
-       case 36 : hTextrahmenErstellen ("Semmi karhozattyoc nincz most azoknac, a kic az Iesus Christusban be oltattac",10,10,40,40)
-       case 39 : hTextrahmenErstellen ("Il documento 'Senza nome 1' stato modififcato",10,10,40,40)
-       case 45 : hTextrahmenErstellen ("at du har nok i dit hvis du",10,10,40,40 )
-       case 46 : hTextrahmenErstellen ("Detta är en text utan delade ord",10,10,40,40)
-       case 48 : hTextrahmenErstellen (" Jeoli jednak zechcesz",10,10,40,40)
-       case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne eine Moeglichkeit Woerter zu trennen",10,10,40,40)
-       case 50 : hTextrahmenErstellen ("Zato ves čas iščemo nove člane: sodelujte",10,10,40,40)
-       case 55 : hTextrahmenErstellen ("a Sun tentou adquirir a Apple",10,10,40,40)
-       case else : if bAsianLan then
-                     printlog "For the language  " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)"
-                     printlog " :-) will use English instead"
-                     hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40)
-                  else
-                     Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here"
-                  endif
-   end select
-   hTypeKeys "<Home>"
-   ToolsLanguageHyphenationDraw								'/// Try  ///'
-   Kontext "Hyphenation"
-   if Hyphenation.Exists =True Then
-      Warnlog "Dialog exists"
-      Hyphenation.Cancel
-   else
-      Kontext "Active"
-      if Active.Exists then Active.OK
-   end if
-
-   Call hCloseDocument 										'/// Close document ///'
-   
-endcase 'tiToolsHyphenation1
-
-'-------------------------------------------------------------------------------
-testcase tiToolsHyphenation2
-
-  dim iWaitIndex as integer
-  dim sExt as string
-  Dim i : Dim DasWort2 : Dim DasWort3 : Dim DasWort4 : Dim DasWort5 : Dim DasWort6 : Dim DasWort7
-  Dim DasWort as string
-  dim sDraw as string
-  dim sFile as string
-  PrintLog "- Tools/Hyphenation2"
-   Select Case gApplication
-      case "DRAW"         : sExt = ".odg"
-      case "IMPRESS"      : sExt = ".odp"
-   end select
-
-   if ((not bAsianLan) AND (iSprache <> 07)) then
-       sFile = gTesttoolpath + "graphics\required\input\silben_"+iSprache+sExt
-       hFileOpenLocally( sFile )
-   endif
-
-   select case iSprache					'/// Open prepared document ///'
-       case 01 :DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on"  '+Chr(34)
-       case 07 : qaerrorlog "- No Hypenation for Russian available"
-                 goto endsub
-       case 31 :DasWort = "siteit" : DasWort2 = "iteit" : DasWort3 = "teit" : DasWort4 = "eit"
-       case 33 :DasWort = "ture" : DasWort2 = "ure" : DasWort3 = "re" : DasWort4 = "e"
-       case 34 :DasWort = "chvo" : DasWort2 = "hvo" : DasWort3 = "vo" : DasWort4 = "o"
-       case 36 :DasWort = "zatnal" : DasWort2 = "atnal" : DasWort3 = "tnal" : DasWort4 = "nal"
-       case 39 :DasWort = "sentu" : DasWort2 = "entu" : DasWort3 = "ntu" : DasWort4 = "tu"
-       case 46 :DasWort = "niska" : DasWort2 = "iska" : DasWort3 = "ska" : DasWort4 = "ka"
-       case 48 :DasWort = "nie" : DasWort2 = "ie" : DasWort3 = "e"
-       case 49 :DasWort = "nung" : DasWort2 = "ung" : DasWort3 = "ng" : DasWort4 = "g"
-       case 50 :DasWort = "nica" : DasWort2 = "ica" : DasWort3 = "ca" : DasWort4 = "a"
-       case 55 :DasWort = "gia" : DasWort2 = "ia" : DasWort3 = "a" : DasWort4 = "ogia"
-       case else : if bAsianLan then
-             printlog "For the language  " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)"
-             printlog " :-) will use English instead"
-             hFileOpenLocally( gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt )
-             DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on"  '+Chr(34)
-          else
-             Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here and create file: "+sFile
-             hNewDocument
-          endif
-   end select
-
-  printlog "   - Test hyphenation"
-   EditSelectAll '/// Press CTRL + A to select all ///'
-   '/// press return to go into the edit mode ///'
-   hTypeKeys "<Return>"
-
-   sleep 1
-   ' WA for draw, or smth else: get text part before hyphenation:
-   if iSprache = "1" OR bAsianLan = TRUE then
-      hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT RIGHT>"      '/// Select part of text and compare it with original text at this place ///'
-   else
-      hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>"
-   endif
-   EditCopy
-   sDraw = GetClipboardText()
-   EditSelectAll						'/// Select whole text ///'
-   ToolsLanguageHyphenationDraw					'/// Run Hyphenation ///'
-   gMouseClick 50,50
-   hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>"		'/// Select part of text and compare it with original text at this place ///'
-   sleep 3
-   EditCopy
-printlog GetClipboardText
-    select case GetClipboardText
-           case DasWort  : printlog "  - Hyphenation worked"
-           case DasWort2 : printlog "  - Hyphenation worked"
-           case DasWort3 : printlog "  - Hyphenation worked"
-           case DasWort4 : printlog "  - Hyphenation worked"
-           case else : warnlog "  - Hyphenation didnt work"
-    end select
-    if GetClipboardText <> sDraw then
-       Printlog " - WA draw hyphenation did work :-)"
-    else
-       Warnlog "  - Hyphenation did not work"
-       Printlog "Expected: '"+DasWort+"'; or something different than: '"+sDraw+"'; But what we got was: '"+GetClipboardText+"'"
-    end if
-   sleep 1
- Call hCloseDocument						'/// Close document ///'
- 
-endcase 'tiToolsHyphenation2
-
-'-------------------------------------------------------------------------------
-testcase tToolsMacro
-
-    Dim i as integer
-    Dim j as integer
-    Dim Zaehler as integer
-    Dim ZaehlerListe as integer
-
-    Call hNewDocument
-
-    ToolsMacro
-    Kontext "Makro"
-
-    '/// to get the count of all macros, the list needs to get elapsed-all ///'
-    for j = 1 to 2
-        Zaehler=MakroAus.GetItemCount
-        MakroAus.typeKeys "<end>"
-        for i = 1 to Zaehler
-            MakroAus.typeKeys "<+><up>"
-        next i
-    next j
-    Zaehler=MakroAus.GetItemCount
-    for i= 1 to Zaehler
-        printlog "Starting Macro: (" + i + "/"+ Zaehler + ")"
-        MakroAus.Select i
-        if Makroname.GetText = "" Then
-            try
-                Ausfuehren.Click
-                Aufzeichnen.Click
-                Zuordnen.Click
-                Bearbeiten.Click
-                Warnlog "  - Controls should not be visible"
-            catch
-                Printlog "  Contrls invisible because no macro choosen"
-            endcatch
-        else
-            SetClipboard = Makroname.GetText
-            ZaehlerListe=MakroListe.GetItemCount
-            for j=2 to ZaehlerListe
-                Makroliste.Select j
-                if Makroname.GetText<>GetClipboardText Then
-                    Printlog "  Selection got used"
-                else
-                    Warnlog "  - Selection not right, it should be: " + Makroliste.GetSelText + " but it is: " + GetClipboardText
-                end if
-            next j
-        end if
-    next i
-
-    Printlog "  run macros"
-    MakroAus.Select 6  '3
-    Ausfuehren.Click
-    sleep 10
-    if Makro.Exists Then
-        Warnlog "  - Macro not executed"
-    else
-        Printlog "  Macro executed"
-        ToolsMacro
-        Kontext "Makro"
-    end if
-
-    Zuordnen.Click
-    Kontext
-    Active.SetPage TabCustomizeMenu
-    Kontext "TabCustomizeMenu"
-    If TabCustomizeMenu.Exists Then
-        Printlog "  Assign macro works"
-        TabCustomizeMenu.Cancel
-        sleep 3
-        Kontext "Makro"
-    else
-        Warnlog "  - Assigning macro does not work"
-    end if
-
-    Bearbeiten.Click
-    try
-        sleep 1 ' this sleep is necessary. it takes some time, until focuse switched to basic window!
-        ViewNavigator
-        kontext "NavigatorDraw"
-        if NavigatorDraw.exists (5) then
-            Warnlog "  - Edit macro does not work"
-            ViewNavigator
-        endif
-    catch
-        hCloseDocument
-        Kontext "DocumentDraw"
-        ToolsMacro
-        Kontext "Makro"
-        Printlog "  Edit macro works"
-    endcatch
-
-    MakroAus.typeKeys "<end>"
-    Zaehler = Makroliste.GetItemCount
-    Neu.Click ' same as delete
-    kontext "NeuesModul"
-    Modulname.SetText "NewMarco"
-    NeuesModul.OK
-    ToolsMacro
-    Kontext "Makro"
-    if (Makroliste.GetItemCount = (Zaehler+1)) Then
-        Printlog "  New macro works"
-    else
-        Warnlog "  - Macro wasn't created"
-    end if
-
-    if (Makroliste.GetItemCount <> Makroliste.getSelIndex) Then
-        Warnlog "  created Macro not selected"
-        Makroaus.Select(Makroaus.GetItemCount)
-    end if
-    sleep 1
-    Loeschen.Click
-    sleep 1
-    Kontext "Active"
-    printlog Active.getText
-    Active.Yes
-    sleep 2
-    Kontext "Makro"
-    if (Makroliste.GetItemCount = 0) Then
-        Printlog "  Delete macro works"
-    else
-        Warnlog "  - Macro wasn't deleted"
-    end if
-    sleep 2
-    makro.close
-    'TODO: organizer testing!
-    Call hCloseDocument
-    Call hCloseDocument
-    
-endcase 'tToolsMacro
diff --git a/testautomation/graphics/optional/includes/global/g_zoom.inc b/testautomation/graphics/optional/includes/global/g_zoom.inc
index c82b6743966a..90741015aafd 100644
--- a/testautomation/graphics/optional/includes/global/g_zoom.inc
+++ b/testautomation/graphics/optional/includes/global/g_zoom.inc
@@ -49,20 +49,22 @@ testcase tViewZoom
     Datei$ = ConvertPath (gOfficePath + "user\work\test." & ExtensionString)
 
     Printlog "- View-Zoom testing"
-  if dir(Datei$) <> "" then app.Kill(Datei$) ' to avoid the anoying overwrite warnlog :-)
-  Call hNewDocument            '/// new document ///'
+    printlog "to avoid the anoying overwrite warnlog :-)"
+  if dir(Datei$) <> "" then app.Kill(Datei$)
+  printlog "new document"
+Call hNewDocument            
   ViewZoom
   Kontext "Massstab"
-  Vergroesserung100.Check       '/// set zoom to 50% ///'
+  Vergroesserung100.Check       
   Massstab.OK
-  '/// create a number of rectangles with different color properties ///'
+  printlog "create a number of rectangles with different color properties"
    Kontext "SD_Farbleiste"
    sleep 1
     if SD_Farbleiste.Exists then
        Printlog "- Color toolbar will be disabled now"
        ViewToolbarsColorBar
     end if
-   '/// All rectangles are created with same dimensions but using different zoom settings ///'
+   printlog "All rectangles are created with same dimensions but using different zoom settings"
    For Zaehler = 1 to 9
       Position1 = 5 * Zaehler - 3
       Position2 = 105 - 5 * Zaehler
@@ -77,9 +79,11 @@ testcase tViewZoom
        gMouseClick 50,0
    Next Zaehler
    sleep 2
-  hFileSaveAs (Datei$)        '/// save document ///'
+    printlog "save document"
+    hFileSaveAs (Datei$)
   sleep 3
-   for Zaehler = 1 to 6	          '/// changing zoom settings and checking functionality with controlling the color of the selected rectangle ///'
+  printlog "changing zoom settings and checking functionality with controlling the color of the selected rectangle"
+   for Zaehler = 1 to 6	          
       ViewZoom
       Kontext "Massstab"
       VergroesserungStufenlos.check
@@ -103,18 +107,14 @@ testcase tViewZoom
          Case 6: VergroesserungStufenlos.check
                  Stufenlos.Settext "200"
                  
-         'Case 2: Vergroesserung50.check
-         'Case 3: Vergroesserung75.check
-         'Case 4: Vergroesserung100.check
-         'Case 5: Vergroesserung150.check
-         'Case 6: Vergroesserung200.check
       End Select
       Massstab.OK
        sleep 1
       Kontext "DocumentImpress"
-       gMouseClick 15,15            'hier soll die Maus ein Rechteck treffen;
-                                    'die Farbe des Rechtecks sagt uns dann, ob
-      FormatArea                    'richtig vergroessert oder verkleinert wurde.
+      printlog "Mouseclick should hit a rectangle. Color tells us then if it was zoomed correctly."
+       gMouseClick 15,15        
+                                    
+      FormatArea                    
        sleep 1
       Kontext
       Active.SetPage TabFarben
@@ -128,6 +128,6 @@ testcase tViewZoom
   'Optimal.push
   'Seitenbreite.push
   sleep 2
-
- Call hCloseDocument         '/// close document ///'
+  printlog "close document"
+ Call hCloseDocument         
 endcase
diff --git a/testautomation/graphics/optional/includes/impress/i_animation.inc b/testautomation/graphics/optional/includes/impress/i_animation.inc
index 8ee7777e5994..ac1c07ed817e 100644
--- a/testautomation/graphics/optional/includes/impress/i_animation.inc
+++ b/testautomation/graphics/optional/includes/impress/i_animation.inc
@@ -37,151 +37,178 @@
 ' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\grafix3.ras")
 
 testcase tExtrasAnimation
+
+    Dim i
+    Dim Zaehler
+    Dim ZaehlerAnpassung
+
+
     Printlog "- Tools/Animation"
- Dim i
- Call hNewDocument
-    Call sSelectEmptyLayout									'/// New impress document ///'
- sleep 2
- InsertGraphicsFromFile									'/// insert graphic file (sample.bmp) ///'
- sleep 1
- Kontext "GrafikEinfuegenDlg"
- sleep 2
+    printlog "New impress document "
+    Call hNewDocument
+    Call sSelectEmptyLayout
+    sleep 2
+    printlog "insert graphic file (sample.bmp) "
+    InsertGraphicsFromFile
+    sleep 1
+    Kontext "GrafikEinfuegenDlg"
+    sleep 2
 
     Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
     sleep 2
     Oeffnen.Click
     sleep 2
- Kontext "DocumentImpress"
- DocumentImpress.MouseDoubleClick 90,90							'/// Deselect graphic ///'
- sleep 1
- InsertGraphicsFromFile
- sleep 2
- Kontext "GrafikEinfuegenDlg"
- Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\grafix3.ras")
- sleep 2
- Oeffnen.Click
- sleep 2
- Opl_SD_EffekteZulassen
- Kontext "Animation"
- 
- for i=1 to 10
-     BildAufnehmen.Click								'/// add selected picture 10 times into the animation ///'
- next i
- sleep 1
-  if AnzahlBilder.GetText <> "10" Then 							'/// compare frame number in animation dialog ///'
-     WarnLog "  - Adding graphics did not work"
-  else
-     PrintLog "  Pictures added"
-  end if
-
- if AlleAufnehmen.IsEnabled Then WarnLog "  - Add all should not be enabled, there is only 1 graphic selected"	'/// test if Add all is eneabled (shouldn't be because of only 1 object selected) ///'
- Kontext "DocumentImpress"
- EditSelectAll							'/// Select both pictures ///'
-
- Kontext "Animation"
-
- for i=1 to 5
-     AlleAufnehmen.Click								'/// Add all (5 times) ///'
- next i
- sleep 1
-  if AnzahlBilder.GetText <> "20" Then 							'/// check if number of frames is now 20 ///'
-     WarnLog "  - Adding pics did not work"
-  else
-     PrintLog "  All pics added"
-  end if
-
- ErstesBild.Click									'/// Click First Picture  ///'
-
-  if AnzahlBilder.GetText <> "1" Then 							'/// Control if we are at frame 1 ///'
-     WarnLog "  - Jump back to start did not work"
-  else
-     PrintLog "  Jumped back to first picture"
-  end if
-
- LetztesBild.Click									'/// Go to last picture ///'
-
-  if AnzahlBilder.GetText <> "20" Then 							'/// Control frame number ///'
-     WarnLog "  - Jump to end did not work"
-  else
-     PrintLog "  Jump to end did work"
-  end if
-
- Abspielen.Click									'/// Play animation ///'
- sleep 3
- Kontext "DocumentImpress"
- EditSelectAll										'/// Select all in document ///'
- DocumentImpress.TypeKeys "<DELETE>"							'/// Delete content ///'
-
- Kontext "Animation"
- Erstellen.Click									'/// /Create animation //'
- sleep 10
-
- Kontext "DocumentImpress"
-  try
-     EditCopy										'/// Try to copy ccreated animation into clipboard ///'
-     PrintLog "  animation created"
-  catch
-     WarnLog "  - Animation not created"
-  endcatch
-
- Kontext "Animation"
-
-  if AnimationsgruppeGruppenobjekt.IsChecked=True Then
-     try
-        AnzeigedauerProBild.SetText "1"						'/// Try setting duration per frame ///'
-        WarnLog "  - Edit field should be disabled"
-     catch
-        PrintLog "  Edit field not enabled because groupobject status is = " + AnimationsgruppeGruppenobjekt.IsChecked
-     endcatch
-  end if
-
-
- AnimationsgruppeBitmapobjekt.Check							'/// check animation group object ///'
-
-  AnzeigedauerProBild.SetText "3"							'/// Set duration per frame to 3///'
-  SetClipboard AnzeigedauerProBild.GetText
-  AnzeigedauerProBild.More 								'/// Raise value for duration ///'
-   if AnzeigedauerProBild.GetText <> GetClipboardText Then
-      PrintLog "  Time per pic could be edited"
-   else
-      WarnLog "  - Time per pic could be edited"
-   end if
-
-  Dim Zaehler
-  Zaehler = AnzahlDurchlaeufe.GetItemCount
-   for i=1 to Zaehler									'/// Change number of plays ///'
-       AnzahlDurchlaeufe.Select i
-   next i
-     PrintLog "  Number of loops checked"
-
-
-  Dim ZaehlerAnpassung
-  ZaehlerAnpassung=Anpassung.GetItemCount						'/// change ZaehlerAnpassung ///'
-   for i=1 to ZaehlerAnpassung
-       Anpassung.Select i
-   next i
-    PrintLog "  Loop count changed"
-
- BildLoeschen.Click									'/// Delete 1 frame ///'
-  if AnzahlBilder = "20" Then
-     WarnLog "  - Delete pictures from animation did not work"
-  else
-     PrintLog "  Picture No20 deleted"
-  end if
-
- AlleLoeschen.Click									'/// Delete all frames ///'
- Kontext "Active"
- Active.Yes
- sleep 3
-
- Kontext "Animation"
-  if Abspielen.IsEnabled=true Then
-     WarnLog "  - Not all pics could be deleted"
-  else
-     PrintLog "  all pics deleted"
-  end if
- sleep 2
- Animation.Close
- sleep 2
- Call hCloseDocument									'/// close document///'
+    Kontext "DocumentImpress"
+    printlog "Deselect graphic "
+    DocumentImpress.MouseDoubleClick 90,90
+    sleep 1
+    InsertGraphicsFromFile
+    sleep 2
+    Kontext "GrafikEinfuegenDlg"
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\grafix3.ras")
+    sleep 2
+    Oeffnen.Click
+    sleep 2
+    Opl_SD_EffekteZulassen
+    Kontext "Animation"
+
+    printlog "add selected picture 10 times into the animation "
+    for i=1 to 10
+        BildAufnehmen.Click
+    next i
+    sleep 1
+    printlog "compare frame number in animation dialog "
+    if AnzahlBilder.GetText <> "10" Then
+        WarnLog "  - Adding graphics did not work"
+    else
+        printlog "Pictures added"
+    end if
+
+    printlog "test if Add all is eneabled (shouldn't be because of only 1 object selected) "
+    if AlleAufnehmen.IsEnabled Then WarnLog "  - Add all should not be enabled, there is only 1 graphic selected"
+    Kontext "DocumentImpress"
+    printlog "Select both pictures "
+    EditSelectAll
+    Kontext "Animation"
+    printlog "Add all (5 times) "
+    for i=1 to 5
+        AlleAufnehmen.Click
+    next i
+    sleep 1
+    printlog "check if number of frames is now 20 "
+    if AnzahlBilder.GetText <> "20" Then
+        WarnLog "  - Adding pics did not work"
+    else
+        printlog "All pics added"
+    end if
+
+    printlog "Click First Picture  "
+    ErstesBild.Click
+
+    printlog "Control if we are at frame 1 "
+    if AnzahlBilder.GetText <> "1" Then
+        WarnLog "  - Jump back to start did not work"
+    else
+        printlog "Jumped back to first picture"
+    end if
+
+    printlog "Go to last picture "
+    LetztesBild.Click
+
+    printlog "Control frame number "
+    if AnzahlBilder.GetText <> "20" Then
+        WarnLog "  - Jump to end did not work"
+    else
+        printlog "Jump to end did work"
+    end if
+
+    printlog "Play animation "
+    Abspielen.Click
+    sleep 3
+    Kontext "DocumentImpress"
+    printlog "Select all in document "
+    EditSelectAll
+    printlog "Delete content "
+    DocumentImpress.TypeKeys "<DELETE>"
+
+    Kontext "Animation"
+    printlog "Create animation"
+    Erstellen.Click
+    sleep 10
+
+    Kontext "DocumentImpress"
+    try
+        printlog "Try to copy ccreated animation into clipboard "
+        EditCopy
+        printlog "animation created"
+    catch
+        WarnLog "  - Animation not created"
+    endcatch
+
+    Kontext "Animation"
+
+    if AnimationsgruppeGruppenobjekt.IsChecked=True Then
+        try
+            printlog "Try setting duration per frame "
+            AnzeigedauerProBild.SetText "1"
+            WarnLog "  - Edit field should be disabled"
+        catch
+            printlog "Edit field not enabled because groupobject status is = " + AnimationsgruppeGruppenobjekt.IsChecked
+        endcatch
+    end if
+
+
+    printlog "check animation group object "
+    AnimationsgruppeBitmapobjekt.Check
+
+    printlog "Set duration per frame to 3"
+    AnzeigedauerProBild.SetText "3"
+    SetClipboard AnzeigedauerProBild.GetText
+    printlog "Raise value for duration "
+    AnzeigedauerProBild.More
+    if AnzeigedauerProBild.GetText <> GetClipboardText Then
+        printlog "Time per pic could be edited"
+    else
+        WarnLog "  - Time per pic could be edited"
+    end if
+
+    Zaehler = AnzahlDurchlaeufe.GetItemCount
+    printlog "Change number of plays "
+    for i=1 to Zaehler
+    AnzahlDurchlaeufe.Select i
+    next i
+    printlog "Number of loops checked"
+
+    printlog "change ZaehlerAnpassung "
+    ZaehlerAnpassung=Anpassung.GetItemCount
+    for i=1 to ZaehlerAnpassung
+        Anpassung.Select i
+    next i
+    printlog "Loop count changed"
+
+    printlog "Delete 1 frame "
+    BildLoeschen.Click
+    if AnzahlBilder = "20" Then
+        WarnLog "  - Delete pictures from animation did not work"
+    else
+        printlog "Picture No20 deleted"
+    end if
+
+    printlog "Delete all frames "
+    AlleLoeschen.Click
+    Kontext "Active"
+    Active.Yes
+    sleep 3
+
+    Kontext "Animation"
+    if Abspielen.IsEnabled=true Then
+        WarnLog "  - Not all pics could be deleted"
+    else
+        printlog "all pics deleted"
+    end if
+    sleep 2
+    Animation.Close
+    sleep 2
+    printlog "close document"
+    Call hCloseDocument
 endcase
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc
index 4f19f254b055..aed79a6ce827 100644
--- a/testautomation/graphics/optional/includes/impress/i_pengine.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc
@@ -36,26 +36,24 @@
 '\*******************************************************************
 
 testcase tiPenginefast
-'   dim i,t,q as integer
-'   dim e as string
-   dim sFileName as string
+    '   dim i,t,q as integer
+    '   dim e as string
+    dim sFileName as string
 
-'/// the Presentation-Engine consists of showing the presentation, with all it's effects. ///'
-
-'/// 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
 
+    printlog "Open the test-file."
+    Call hDateiOeffnen (gTesttoolpath + "graphics\required\input\allshapes.odp")
 
-    '/// Open the test-file. ///'
-    Call hDateiOeffnen (gTesttoolpath + "graphics\required\input\allshapes.odp") 'effects.odp")
-
-    '/// Start the slideshow. ///'
+    printlog "Start the slideshow."
     CALL hTypeKeys "<F5>"
     sleep (5)
     kontext "DocumentPresentation"
     DocumentPresentation.TypeKeys "<SPACE>"
-    '/// Wait for the presentation to reach a certain moment. ///'
+    printlog "Wait for the presentation to reach a certain moment."
     sleep (10)
     DocumentPresentation.TypeKeys "<SPACE>"
     sleep (7)
@@ -63,7 +61,7 @@ testcase tiPenginefast
     sleep (7)
     DocumentPresentation.TypeKeys "<SPACE>"
     sleep (7)
-    '/// Press "Space" again, to continue with slide two. ///'
+    printlog "Press "Space" again, to continue with slide two."
     DocumentPresentation.TypeKeys "<SPACE>"
     sleep (7)
     DocumentPresentation.TypeKeys "<SPACE>"
@@ -72,19 +70,18 @@ testcase tiPenginefast
     sleep (7)
     DocumentPresentation.TypeKeys "<SPACE>"
     sleep (7)
-    '/// And press "Space" again, to exit the presentation-mode. ///'
+    printlog "And press "Space" again, to exit the presentation-mode."
     DocumentPresentation.TypeKeys "<SPACE>"
-
     FileClose
 
     Call hNewDocument
     sleep 1
-    '/// Open the test-file. ///'
+    printlog "Open the test-file."
     Call hDateiOeffnen (gTesttoolpath + "graphics\required\input\effects.odp")
-    '/// Start the slideshow. ///'
+    printlog "Start the slideshow."
     CALL hTypeKeys "<F5>"
     sleep (200)
-    '/// Press "Space" again, to continue with slide two. ///'
+    printlog "Press Space again, to continue with slide two."
     kontext "DocumentPresentation"
     DocumentPresentation.TypeKeys "<SPACE>"
     sleep (40)
@@ -126,93 +123,94 @@ testcase tiPenginefast
         kontext "DocumentImpress"
     end if
 
-'/// Insert a new slide. ///'
-'   InsertSlide
-'   sleep 2
-'   hTypekeys "<Pagedown>"
-'   sleep 2
-
-'/// Menu: Slideshow: Check every menu-item. ///'
-
-'Exists:
-' #1 tSlideShowSlideShow
-' #1 tSlideShowRehearseTimings
-' #1 tSlideShowSlideShowSettings
-' #1 tSlideShowCustomSlideShow
-' #1 tSlideShowSlideTransition
-' #1 tSlideShowShowHideSlide
-
-'   Slideshow menu 1 - Slide show
-'   Slideshow menu 2 - Slide show settings
-'   Slideshow menu 3 - Rehearse timings
-'   Slideshow menu 4 - Interaction
-'   Slideshow menu 6 - Slide Transition
-'   Slideshow menu 7 - Show / Hide slide
-'   Slideshow menu 8 - Custom Slide show
-
-
-'Printlog " Here starts the test "
-
-'Presentation - Start / Stop. Different ways to do it.
-'Presentation - Effects.
-'LeftWindow
-
-'/// Slideshow Settings: Range: test all three alternatives. ///'
-'/// Test if the Slideshow-types (Default, Window, Auto) works. ///'
-'/// Check if the checkboxes works. ///'
-'/// Close dialogue. ///'
-'/// Add an object. ///'
-'/// Custom Animation: Add an Animation to the object. ///'
-'/// Run the slideshow. ///'
-
-'/// Change to the next effect and continue through every animation in ///'
-'/// Entrance, Emphasis, Exit and Motion Paths. ///'
-'/// While testing - test the speed-choices for every kind of animation. ///'
-'/// Check if the "Change" and "Remove"-buttons. ///'
-'/// Check the Start, "Direction" and "Speed" variables. ///'
-'/// Add two effects to one object and change the order. ///'
-'/// Try the Play and "Slide Show"-button. ///'
-'/// Try the Automatic preview-button. ///'
-
-'/// Slidetransition. ///'
-'/// Go through every kind of effect, speed, and sound. ///'
-'/// Check loop until next sound. ///'
-'/// Check the Advance slide with mouseclick-function. ///'
-'/// Check the "Apply to all slides", "Play", and "Slide Show"-buttons. ///'
-'/// Check Automatic preview. ///'
-
-'/// Some effects doesnt have a right / left orientation. Test these. ///'
-'/// Possibility: check random effects and see if something hangs. ///'
-
-'/// Load/Save-test: Does the settings last? ///'
-
-'/// Are two different objects dependant or independent from each other? ///'
-
-'/// Close Application ///'
+    printlog "Insert a new slide."
+    '   InsertSlide
+    '   sleep 2
+    '   hTypekeys "<Pagedown>"
+    '   sleep 2
+
+    printlog "Menu: Slideshow: Check every menu-item."
+
+    'Exists:
+    ' #1 tSlideShowSlideShow
+    ' #1 tSlideShowRehearseTimings
+    ' #1 tSlideShowSlideShowSettings
+    ' #1 tSlideShowCustomSlideShow
+    ' #1 tSlideShowSlideTransition
+    ' #1 tSlideShowShowHideSlide
+
+    '   Slideshow menu 1 - Slide show
+    '   Slideshow menu 2 - Slide show settings
+    '   Slideshow menu 3 - Rehearse timings
+    '   Slideshow menu 4 - Interaction
+    '   Slideshow menu 6 - Slide Transition
+    '   Slideshow menu 7 - Show / Hide slide
+    '   Slideshow menu 8 - Custom Slide show
+
+
+    'Printlog " Here starts the test "
+
+    'Presentation - Start / Stop. Different ways to do it.
+    'Presentation - Effects.
+    'LeftWindow
+
+    printlog "Slideshow Settings: Range: test all three alternatives."
+    printlog "Test if the Slideshow-types (Default, Window, Auto) works."
+    printlog "Check if the checkboxes works."
+    printlog "Close dialogue."
+    printlog "Add an object."
+    printlog "Custom Animation: Add an Animation to the object."
+    printlog "Run the slideshow."
+
+    printlog "Change to the next effect and continue through every animation in"
+    printlog "Entrance, Emphasis, Exit and Motion Paths."
+    printlog "While testing - test the speed-choices for every kind of animation."
+    printlog "Check if the "Change" and "Remove"-buttons."
+    printlog "Check the Start, "Direction" and "Speed" variables."
+    printlog "Add two effects to one object and change the order."
+    printlog "Try the Play and "Slide Show"-button."
+    printlog "Try the Automatic preview-button."
+
+    printlog "Slidetransition."
+    printlog "Go through every kind of effect, speed, and sound."
+    printlog "Check loop until next sound."
+    printlog "Check the Advance slide with mouseclick-function."
+    printlog "Check the "Apply to all slides", "Play", and "Slide Show"-buttons."
+    printlog "Check Automatic preview."
+
+    printlog "Some effects doesnt have a right / left orientation. Test these."
+    printlog "Possibility: check random effects and see if something hangs."
+
+    printlog "Load/Save-test: Does the settings last?"
+
+    printlog "Are two different objects dependant or independent from each other?"
+
+    printlog "Close Application"
     Call hCloseDocument
     Printlog "Finished Optional-test for Presentation-Engine"
-endcase
+endcase 'tiPenginefast
 
+'-------------------------------------------------------------------------------
 
 testcase tSlideShowInteraction
-   Dim Datei$
-   Dim i as integer
-   Dim Zaehler as integer
-   dim b115364 as boolean
+    Dim Datei$
+    Dim i as integer
+    Dim Zaehler as integer
+    dim b115364 as boolean
 
-   Datei$ =ConvertPath (gOfficePath + "user\work\interac.sxi")
+    Datei$ =ConvertPath (gOfficePath + "user\work\interac.sxi")
 
-'   '/// save file as presentation with name '"user\\work\\diashow.sxi")' ///'
+'   printlog "save file as presentation with name '"user\\work\\diashow.sxi")'"
 '   hFileSaveAsWithFilterKill ( sFile , gImpressFilter, FALSE )
 '   Printlog "saved presetation: '" + sFile + "'"
 
-   '/// open application ///'
+   printlog "open application"
    Call hNewDocument
    sleep 5
-   setStartCurrentPage(FALSE)   '/// Set "start with current page to OFF ///'
+   setStartCurrentPage(FALSE)   printlog "Set "start with current page to OFF"
 
-   '/// call 'Insert->Slide' three times and name the slides 2, 3, 4 and create a rectangle 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 "
+   '///+ we now have 4 slides ?! :-)"
    for i = 2 to 4
       InsertSlide
       sleep 2
@@ -222,7 +220,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
       warnlog "Navigator: already open :-("
@@ -232,194 +230,194 @@ testcase tSlideShowInteraction
    endif
    sleep 3
 
-   '/// Slide Show->Interaction ///'
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      sleep 1
-      if AktionBeiMausklick.GetItemCount = 13 Then
-         Printlog "- List is complete"
-      else
-         Warnlog "- Number of possible actions is wrong. It should be: 13, but it is: " + AktionBeiMausklick.GetItemCount
-      end if
-      sleep 1
-
-      AktionBeiMausklick.Select 1                       'Keine Aktion bei Mausclick
-         Printlog (AktionBeiMausklick.GetSelText + " chosen")
-         If Durchsuchen.IsVisible then Warnlog "- Control should be invisible because AktionBeiMausklick = " + AktionBeiMausKlick.GetSelText
-         sleep 1
-
-      Kontext "TabInteraktion"
-      AktionBeiMausklick.Select 2                       'Sprung zur vorhergehenden Seite
-         Printlog (AktionBeiMausklick.GetSelText + " chosen")
-         if Durchsuchen.IsVisible Then Warnlog "- Control should be invisible, beacause Action = " + AktionBeiMausKlick.GetSelText
-      TabInteraktion.OK
-      sleep 2
-   Kontext "DocumentImpress"
-   gMouseClick 90,90
-   sleep 1
-   gMouseClick 50,50
+    printlog "Slide Show->Interaction"
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    if AktionBeiMausklick.GetItemCount = 13 Then
+        Printlog "- List is complete"
+    else
+        Warnlog "- Number of possible actions is wrong. It should be: 13, but it is: " + AktionBeiMausklick.GetItemCount
+    end if
+    sleep 1
+
+    AktionBeiMausklick.Select 1                       'Keine Aktion bei Mausclick
+    Printlog (AktionBeiMausklick.GetSelText + " chosen")
+    If Durchsuchen.IsVisible then Warnlog "- Control should be invisible because AktionBeiMausklick = " + AktionBeiMausKlick.GetSelText
+    sleep 1
+
+    Kontext "TabInteraktion"
+    AktionBeiMausklick.Select 2                       'Sprung zur vorhergehenden Seite
+    Printlog (AktionBeiMausklick.GetSelText + " chosen")
+    if Durchsuchen.IsVisible Then Warnlog "- Control should be invisible, beacause Action = " + AktionBeiMausKlick.GetSelText
+    TabInteraktion.OK
+    sleep 2
+    Kontext "DocumentImpress"
+    gMouseClick 90,90
+    sleep 1
+    gMouseClick 50,50
     sleep 2
 
-   Kontext "NavigatorDraw"
-       sleep 2
-      if Not Liste.GetSelIndex = 3 Then
-         Warnlog "- jumped to wrong slide"
-      else
-         Printlog "- jumped to correct slide"
-      end if
-      sleep 1
+    Kontext "NavigatorDraw"
+    sleep 2
+    if Not Liste.GetSelIndex = 3 Then
+        Warnlog "- jumped to wrong slide"
+    else
+        Printlog "- jumped to correct slide"
+    end if
+    sleep 1
 
-   Kontext "DocumentImpress"
-   EditSelectAll
-   sleep 1
+    Kontext "DocumentImpress"
+    EditSelectAll
+    sleep 1
 
-   SlideShowInteraction
-      sleep 2
-      Kontext "TabInteraktion"
-      AktionBeiMausklick.select 3                       'Sprung zur naechsten Seite
-         Printlog (AktionBeiMausKlick.GetSelText + " chosen")
-      TabInteraktion.OK
-      sleep 1
+    SlideShowInteraction
+    sleep 2
+    Kontext "TabInteraktion"
+    AktionBeiMausklick.select 3                       'Sprung zur naechsten Seite
+     Printlog (AktionBeiMausKlick.GetSelText + " chosen")
+    TabInteraktion.OK
+    sleep 1
 
    Kontext "DocumentImpress"
    gMouseClick 90,90
    sleep 2
    gMouseClick 50,50
    Kontext "NavigatorDraw"
-      if Liste.GetSelIndex <> 4 Then
-         Warnlog "- Jumped to wrong slide"
-      else
-         Printlog " Jumped to correct slide"
-      end if
-      sleep 1
-   kontext "DocumentImpress"
-   EditSelectAll
-   sleep 1
-
-   SlideShowInteraction
-      sleep 1
-      Kontext "TabInteraktion"
-      AktionBeiMausklick.select 4                        'Sprung zur ersten Seite
-         Printlog AktionBeiMausKlick.GetSelText
-         sleep 1
-      TabInteraktion.OK
-      sleep 1
-   Kontext "DocumentImpress"
-   gMouseClick 90,90
-   gMouseClick 50,50
-   Kontext "NavigatorDraw"
-      if Liste.GetSelIndex <> 1 Then Warnlog "- jumped to wrong slide"
-      Letzte.Click 'Liste.Select 4
-   Kontext "DocumentImpress"
-   EditSelectAll
-   sleep 2
+    if Liste.GetSelIndex <> 4 Then
+        Warnlog "- Jumped to wrong slide"
+    else
+        Printlog " Jumped to correct slide"
+    end if
+    sleep 1
+    kontext "DocumentImpress"
+    EditSelectAll
+    sleep 1
+
+    SlideShowInteraction
+    sleep 1
+    Kontext "TabInteraktion"
+    AktionBeiMausklick.select 4                        'Sprung zur ersten Seite
+    Printlog AktionBeiMausKlick.GetSelText
+    sleep 1
+    TabInteraktion.OK
+    sleep 1
+    Kontext "DocumentImpress"
+    gMouseClick 90,90
+    gMouseClick 50,50
+    Kontext "NavigatorDraw"
+    if Liste.GetSelIndex <> 1 Then Warnlog "- jumped to wrong slide"
+    Letzte.Click 'Liste.Select 4
+    Kontext "DocumentImpress"
+    EditSelectAll
+    sleep 2
 
     try
         SlideShowInteraction
     catch
         warnlog "SlideshowInteraction diasabled :-("
     endcatch
-      Kontext "TabInteraktion"
-      AktionBeiMausklick.select 5                       'Sprung zur letzten Seite
-         printlog AktionBeiMausKlick.GetSelText
-      TabInteraktion.OK
-      sleep 1
-   Kontext "NavigatorDraw"
-      if Not Liste.GetSelIndex = 1 Then Warnlog "- jumped to wrong slide"
+    Kontext "TabInteraktion"
+    AktionBeiMausklick.select 5                       'Sprung zur letzten Seite
+    printlog AktionBeiMausKlick.GetSelText
+    TabInteraktion.OK
+    sleep 1
+    Kontext "NavigatorDraw"
+    if Not Liste.GetSelIndex = 1 Then Warnlog "- jumped to wrong slide"
 
-   kontext "DocumentImpress"
-   Call hRechteckErstellen 20,20,50,50
-   sleep 1
-   EditSelectAll
-   sleep 1
+    kontext "DocumentImpress"
+    Call hRechteckErstellen 20,20,50,50
+    sleep 1
+    EditSelectAll
+    sleep 1
     try
         FormatGroupGroup
     catch
         warnlog "GROUP?"
     endcatch
-   sleep 1
-
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      AktionBeiMausklick.select 6                       'Sprung zu Seite oder Objekt
-         printlog AktionBeiMausKlick.GetSelText
-         sleep 2
-         if Not ListeSprungZuSeiteObjekt.IsVisible Then Warnlog " list seems to be invisible"
-         Seite.SetText S2
-         Suchen.Click
-            if ListeSprungZuSeiteObjekt.GetSelIndex <> 3 Then Warnlog " Search does not work"
-            printlog ListeSprungZuSeiteObjekt.GetSelIndex
-      TabInteraktion.OK
-      sleep 1
+    sleep 1
 
-   Kontext "DocumentImpress"
-   gMouseClick 90,90
-   gMouseClick 25,25,
-   sleep 2
-   Kontext "NavigatorDraw"
-      if Liste.GetSelIndex <> 2 Then Warnlog "- Jumped to wrong destination"
-      printlog Liste.GetSelIndex
-      Liste.Select 4
-   Kontext "DocumentImpress"
-   EditSelectAll
-   sleep 1
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    AktionBeiMausklick.select 6                       'Sprung zu Seite oder Objekt
+    printlog AktionBeiMausKlick.GetSelText
+    sleep 2
+    if Not ListeSprungZuSeiteObjekt.IsVisible Then Warnlog " list seems to be invisible"
+    Seite.SetText S2
+    Suchen.Click
+    if ListeSprungZuSeiteObjekt.GetSelIndex <> 3 Then Warnlog " Search does not work"
+    printlog ListeSprungZuSeiteObjekt.GetSelIndex
+    TabInteraktion.OK
+    sleep 1
 
-       Kontext "DocumentImpress"
-       EditSelectAll
+    Kontext "DocumentImpress"
+    gMouseClick 90,90
+    gMouseClick 25,25,
+    sleep 2
+    Kontext "NavigatorDraw"
+    if Liste.GetSelIndex <> 2 Then Warnlog "- Jumped to wrong destination"
+    printlog Liste.GetSelIndex
+    Liste.Select 4
+    Kontext "DocumentImpress"
+    EditSelectAll
+    sleep 1
+
+    Kontext "DocumentImpress"
+    EditSelectAll
+    sleep 1
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    AktionBeiMausKlick.Select 7                    'Sprung zu Dokument
+    Printlog AktionBeiMausKlick.GetSelText + " chosen"
+    try
+        Durchsuchen.Click
         sleep 1
-        SlideShowInteraction
-         Kontext "TabInteraktion"
-         sleep 1
-         AktionBeiMausKlick.Select 7                    'Sprung zu Dokument
-           Printlog AktionBeiMausKlick.GetSelText + " chosen"
-           try
-              Durchsuchen.Click
-              sleep 1
-              Kontext "OeffnenDlg"
-              sleep 1
-               Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\recht_49.sxi")
-              Oeffnen.Click
-              sleep 10
-              ' 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."
-                    goto endsub
-                 endif
-              endif
-           catch
-              Warnlog "- Search button could not be accessed"
-           endcatch
-         sleep 1
-         Kontext "TabInteraktion"
-         sleep 1
-         TabInteraktion.OK
-         sleep 3
-         Kontext "DocumentImpress"
-         DocumentImpress.MouseDown 90,90
-         DocumentImpress.MouseUp 90,90
-        sleep 2
-         Kontext "DocumentImpress"
-         DocumentImpress.Mousedown 30,30
-     kontext
-     b115364 = false
-     if messagebox.exists then
-         printlog "baeh: '" + messagebox.gettext + "'"
-         try
-             messagebox.ok  ' was default in so7
-         catch
-             warnlog "behaviour changed #115364# mother document gets closed :-("
-             if fileExists(ConvertPath (gOfficePath + "user\work\bug115364.sxi")) then
-                 kill ConvertPath (gOfficePath + "user\work\bug115364.sxi")
-             endif
-             messagebox.yes ' don't save changes, before going on!
-             b115364 = true
-             kontext "SpeichernDlg"
-             Dateiname.setText ConvertPath (gOfficePath + "user\work\bug115364.sxi")
-             Speichern.click
-             sleep 10
-         endcatch
+        Kontext "OeffnenDlg"
+        sleep 1
+        Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\recht_49.sxi")
+        Oeffnen.Click
+        sleep 10
+        ' 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."
+                goto endsub
+            endif
+        endif
+    catch
+        Warnlog "- Search button could not be accessed"
+    endcatch
+    sleep 1
+    Kontext "TabInteraktion"
+    sleep 1
+    TabInteraktion.OK
+    sleep 3
+    Kontext "DocumentImpress"
+    DocumentImpress.MouseDown 90,90
+    DocumentImpress.MouseUp 90,90
+    sleep 2
+    Kontext "DocumentImpress"
+    DocumentImpress.Mousedown 30,30
+    kontext
+    b115364 = false
+    if messagebox.exists then
+        printlog "baeh: '" + messagebox.gettext + "'"
+        try
+            messagebox.ok  ' was default in so7
+        catch
+            warnlog "behaviour changed #115364# mother document gets closed :-("
+            if fileExists(ConvertPath (gOfficePath + "user\work\bug115364.sxi")) then
+                kill ConvertPath (gOfficePath + "user\work\bug115364.sxi")
+            endif
+            messagebox.yes ' don't save changes, before going on!
+            b115364 = true
+            kontext "SpeichernDlg"
+            Dateiname.setText ConvertPath (gOfficePath + "user\work\bug115364.sxi")
+            Speichern.click
+            sleep 10
+        endcatch
     else
         printlog "OK :-)"
     endif
@@ -444,207 +442,207 @@ testcase tSlideShowInteraction
     endif
     sleep 5
 
-   Kontext "NavigatorDraw"
-      sleep 1
-      Naechste.click
+    Kontext "NavigatorDraw"
+    sleep 1
+    Naechste.click
 
-   Kontext "DocumentImpress"
-   EditSelectAll
-   sleep  1
-
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      sleep 1
-      AktionBeiMausKlick.Select 9
-         Printlog AktionBeiMausKlick.GetSelText + " chosen"
-         sleep 1
-      Tabinteraktion.OK
-   sleep 2
+    Kontext "DocumentImpress"
+    EditSelectAll
+    sleep  1
 
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      sleep 1
-      if not AktionBeiMausKlick.GetSelIndex = 9 Then Warnlog "- Not the right action chosen"
-      sleep 1
-      AktionBeiMausKlick.Select 9                          'Klang abspielen
-           Printlog  AktionBeiMausKlick.GetSelText + "- chosen"
-         sleep 1
-      Tabinteraktion.OK
-      sleep 2
-         Kontext "NavigatorDraw"
-           sleep 1
-           Liste.Select 2
-           Kontext "DocumentImpress"
-            EditSelectAll
-            sleep  1
-           SlideShowInteraction
-            Kontext "TabInteraktion"
-            sleep 1
-             Durchsuchen.Click
-             sleep 1
-             Kontext "OeffnenDlg"
-             sleep 1
-             Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\blip.wav")
-             sleep 1
-             Oeffnen.Click
-                sleep 1
-                Kontext "Active"
-                 if Active.Exists Then
-                    Warnlog Active.GetText + "  Gallery might be empty"
-                    Active.OK
-                    sleep 1
-                    Kontext "OeffnenDlg"
-                    OeffnenDlg.Cancel
-                    sleep 1
-                 end if
-                Kontext "TabInteraktion"
-                SetClipboard Klangwahl.GetText
-             TabInteraktion.OK
-             sleep 1
-             SlideShowInteraction
-             Kontext "TabInteraktion"
-             sleep 1
-             if Klangwahl.GetText <> GetClipboardText then Warnlog "- Not the right sound chosen"
-             TabInteraktion.OK
-             sleep 1
-             InsertGraphicsFromFile
-              sleep 1
-             Kontext "GrafikeinfuegenDlg"
-             sleep 1
-             if Verknuepfen.IsChecked then Verknuepfen.UnCheck
-             Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
-             Oeffnen.Click
-             sleep 3
-             Kontext "NavigatorDraw"
-             sleep 1
-             Liste.Select 4
-             sleep 1
-             SlideShowInteraction
-             Kontext "TabInteraktion"
-             sleep 1
-             AktionBeiMausKlick.Select 11                       'Objektaktion ausfuehren
-                Printlog  AktionBeiMausKlick.GetSelText + " chosen"
-             sleep 1
-            Zaehler=Effekt.GetItemCount
-         for i=1 to Zaehler
-            Effekt.Select i
-            Printlog Effekt.GetSelText + " chosen"
-            if i=1 Then
-               if Langsam.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen"
-               if Mittel.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen"
-               if Schnell.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen"
-            end if
-            sleep 1
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    AktionBeiMausKlick.Select 9
+    Printlog AktionBeiMausKlick.GetSelText + " chosen"
+    sleep 1
+    Tabinteraktion.OK
+    sleep 2
 
-            TabInteraktion.OK
-            sleep 1
-            SlideShowInteraction
-            Kontext "TabInteraktion"
-            sleep 1
-         next i
-         TabInteraktion.OK
-         sleep 1
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      sleep 1
-      AktionBeiMausKlick.Select 10                       'Objekt ausblenden
-         Printlog AktionBeiMausKlick.GetSelText + " chosen"
-         ListeObjektAktion.Select 1
-         sleep 1
-      TabInteraktion.OK
-   sleep 1
-   gMouseClick 90,90
-   sleep 1
-   gMouseClick 55,55
-   sleep 1
-   Kontext "DocumentImage"
-
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      sleep 1
-      AktionBeiMausKlick.Select 13 			'Makro
-         Printlog AktionBeiMausKlick.GetSelText + " chosen"
-         sleep 2
-         Durchsuchen.Click
-            sleep 5
-            Kontext "Makro"
-            sleep 5
-            Makro.Cancel
-         sleep 2
-      Kontext "TabInteraktion"
-      sleep 1
-      TabInteraktion.OK
-      sleep 3
-
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      sleep 2
-      if not AktionBeiMausKlick.GetSelIndex = 12 Then Warnlog "- Wrong action used"
-      sleep 1
-      AktionBeiMausKlick.Select 14           'Praesentation beenden
-         Printlog AktionBeiMausKlick.GetSelText
-      Tabinteraktion.OK
-      sleep 1
-
-   SlideShowPresentationSettings
-      Kontext "Bildschirmpraesentation"
-      if not Fenster.IsChecked Then Fenster.Check
-      BildschirmPraesentation.OK
-   sleep 2
-   Kontext "DocumentImpress"
-   DocumentImpress.TypeKeys "<MOD1 F2>"
-      sleep 5
-      Kontext "DocumentPresentation"
-      sleep 2
-      DocumentPresentation.MouseDown 50,50
-      DocumentPresentation.MouseUp 50,50
-      sleep 5
-      try
-         Kontext "DocumentImpress"
-         EditSelectAll
-         Printlog "- Slideshow ended at right point"
-      catch
-         Warnlog "- Program is still in slideshow mode"
-         Kontext "DocumentPresentation"
-         DocumentPresentation.TypeKeys "<ESCAPE>"
-      endcatch
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    if not AktionBeiMausKlick.GetSelIndex = 9 Then Warnlog "- Not the right action chosen"
+    sleep 1
+    AktionBeiMausKlick.Select 9                          'Klang abspielen
+    Printlog  AktionBeiMausKlick.GetSelText + "- chosen"
+    sleep 1
+    Tabinteraktion.OK
+    sleep 2
+    Kontext "NavigatorDraw"
+    sleep 1
+    Liste.Select 2
+    Kontext "DocumentImpress"
+    EditSelectAll
+    sleep  1
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    Durchsuchen.Click
+    sleep 1
+    Kontext "OeffnenDlg"
+    sleep 1
+    Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\blip.wav")
+    sleep 1
+    Oeffnen.Click
+    sleep 1
+    Kontext "Active"
+    if Active.Exists Then
+        Warnlog Active.GetText + "  Gallery might be empty"
+        Active.OK
+        sleep 1
+        Kontext "OeffnenDlg"
+        OeffnenDlg.Cancel
+        sleep 1
+    end if
+    Kontext "TabInteraktion"
+    SetClipboard Klangwahl.GetText
+    TabInteraktion.OK
+    sleep 1
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    if Klangwahl.GetText <> GetClipboardText then Warnlog "- Not the right sound chosen"
+    TabInteraktion.OK
+    sleep 1
+    InsertGraphicsFromFile
+    sleep 1
+    Kontext "GrafikeinfuegenDlg"
+    sleep 1
+    if Verknuepfen.IsChecked then Verknuepfen.UnCheck
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
+    Oeffnen.Click
+    sleep 3
+    Kontext "NavigatorDraw"
+    sleep 1
+    Liste.Select 4
+    sleep 1
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    AktionBeiMausKlick.Select 11                       'Objektaktion ausfuehren
+    Printlog  AktionBeiMausKlick.GetSelText + " chosen"
+    sleep 1
+    Zaehler=Effekt.GetItemCount
+    for i=1 to Zaehler
+        Effekt.Select i
+        Printlog Effekt.GetSelText + " chosen"
+        if i=1 Then
+        if Langsam.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen"
+        if Mittel.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen"
+        if Schnell.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen"
+        end if
+        sleep 1
 
-   Kontext "DocumentImpress"
-   DocumentImpress.TypeKeys "<SHIFT MOD1 F5>"
-   sleep 3
-   setStartCurrentPage(TRUE)   '/// Set "start with current page to ON = Default ///'
-   Call hCloseDocument
-endcase
+        TabInteraktion.OK
+        sleep 1
+        SlideShowInteraction
+        Kontext "TabInteraktion"
+        sleep 1
+    next i
+    TabInteraktion.OK
+    sleep 1
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    AktionBeiMausKlick.Select 10                       'Objekt ausblenden
+    Printlog AktionBeiMausKlick.GetSelText + " chosen"
+    ListeObjektAktion.Select 1
+    sleep 1
+    TabInteraktion.OK
+    sleep 1
+    gMouseClick 90,90
+    sleep 1
+    gMouseClick 55,55
+    sleep 1
+    Kontext "DocumentImage"
 
-'   Slideshow menu 5 - Custom Animation
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 1
+    AktionBeiMausKlick.Select 13 			'Makro
+    Printlog AktionBeiMausKlick.GetSelText + " chosen"
+    sleep 2
+    Durchsuchen.Click
+    sleep 5
+    Kontext "Makro"
+    sleep 5
+    Makro.Cancel
+    sleep 2
+    Kontext "TabInteraktion"
+    sleep 1
+    TabInteraktion.OK
+    sleep 3
+
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    sleep 2
+    if not AktionBeiMausKlick.GetSelIndex = 12 Then Warnlog "- Wrong action used"
+    sleep 1
+    AktionBeiMausKlick.Select 14           'Praesentation beenden
+     Printlog AktionBeiMausKlick.GetSelText
+    Tabinteraktion.OK
+    sleep 1
+
+    SlideShowPresentationSettings
+    Kontext "Bildschirmpraesentation"
+    if not Fenster.IsChecked Then Fenster.Check
+    BildschirmPraesentation.OK
+    sleep 2
+    Kontext "DocumentImpress"
+    DocumentImpress.TypeKeys "<MOD1 F2>"
+    sleep 5
+    Kontext "DocumentPresentation"
+    sleep 2
+    DocumentPresentation.MouseDown 50,50
+    DocumentPresentation.MouseUp 50,50
+    sleep 5
+    try
+        Kontext "DocumentImpress"
+        EditSelectAll
+        Printlog "- Slideshow ended at right point"
+    catch
+        Warnlog "- Program is still in slideshow mode"
+        Kontext "DocumentPresentation"
+        DocumentPresentation.TypeKeys "<ESCAPE>"
+    endcatch
+
+    Kontext "DocumentImpress"
+    DocumentImpress.TypeKeys "<SHIFT MOD1 F5>"
+    sleep 3
+    setStartCurrentPage(TRUE)   printlog "Set "start with current page to ON = Default"
+    Call hCloseDocument
+endcase 'tSlideShowInteraction
+
+'-------------------------------------------------------------------------------
 
 testcase tSlideShowCustomAnimation
     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", 10, 10, 20, 40 )
-    '/// 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: Entrance ///'
+        printlog "Switch to TabPage: Entrance"
         active.setPage(TabEntrance)
         kontext "TabEntrance"
         if TabEntrance.exists(5) then
             DialogTest(TabEntrance)
-            '/// select in the listbox 'Effects' the second entry ///'
+            printlog "select in the listbox 'Effects' the second entry"
             Effects.select(2)
             Speed.getItemCount
             AutomaticPreview.unCheck
             sleep 1
             AutomaticPreview.Check
             kontext
-            '/// Switch to TabPage: Emphasis ///'
+            printlog "Switch to TabPage: Emphasis"
             active.setPage(TabEmphasis)
             kontext "TabEmphasis"
             if TabEmphasis.exists(5) then
@@ -654,7 +652,7 @@ testcase tSlideShowCustomAnimation
                 warnlog "Impress:Tasks Pane:Custom Animation:TabEmphasis tabPage doesn't work."
             endif
             kontext
-            '/// Switch to TabPage: Exit ///'
+            printlog "Switch to TabPage: Exit"
             active.setPage(TabExit)
             kontext "TabExit"
             if TabExit.exists(5) then
@@ -664,7 +662,7 @@ testcase tSlideShowCustomAnimation
                 warnlog "Impress:Tasks Pane:Custom Animation:TabExit tabPage doesn't work."
             endif
             kontext
-            '/// Switch to TabPage: Motion Paths ///'
+            printlog "Switch to TabPage: Motion Paths"
             active.setPage(TabMotionPaths)
             kontext "TabMotionPaths"
             if TabMotionPaths.exists(5) then
@@ -674,7 +672,7 @@ testcase tSlideShowCustomAnimation
                 bError = true
                 warnlog "Impress:Tasks Pane:Custom Animation:TabMotionPaths tabPage doesn't work."
             endif
-            '/// Close dialog 'Custom Animation' with 'OK' ///'
+            printlog "Close dialog 'Custom Animation' with 'OK'"
             TabMotionPaths.OK
             bError = false
         else
@@ -683,11 +681,11 @@ testcase tSlideShowCustomAnimation
         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
@@ -699,14 +697,14 @@ testcase tSlideShowCustomAnimation
             if EffectProperty.isEnabled then
                 EffectProperty.getItemCount
             endif
-            '/// CLick on button '...' (Options) ///'
+            printlog "CLick on button '...' (Options)"
             EffectOptions.click
             kontext "TabEffect"
             if TabEffect.exists(5) then
                 dialogTest(TabEffect)
                 Sound.getItemCount
                 AfterAnimation.getItemCount
-                '/// switch to TabPage 'Timing' ///'
+                printlog "switch to TabPage 'Timing'"
                 Kontext
                 active.setPage TabTiming
                 kontext "TabTiming"
@@ -723,7 +721,7 @@ testcase tSlideShowCustomAnimation
                 else
                     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"
@@ -753,10 +751,9 @@ testcase tSlideShowCustomAnimation
             endif
             kontext "Tasks"
             EffectAutomaticPreview.isChecked
-            '/// click button 'Remove' ///'
+            printlog "click button 'Remove'"
             EffectRemove.click
         endif
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
-
+endcase
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc
index 92283b35a369..61249353c9d1 100644
--- a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc
@@ -169,7 +169,7 @@ testcase tiSlideCopyNewPresentation
     kontext "DocumentImpress"
     hMouseClick DocumentImpress, 90, 90
     '---------------------------------------------------------------------------3
-    '/// Copy the slide to the clipboard ///'
+    printlog "Copy the slide to the clipboard"
     kontext "Slides"
     SlidesControl.TypeKeys "<PAGEUP>"
     sleep (1)
@@ -182,16 +182,16 @@ testcase tiSlideCopyNewPresentation
         Call hCloseDocument
         Goto Endsub
     endif
-    '/// Close the presentation-window ///'
+    printlog "Close the presentation-window"
     Call hCloseDocument
-    '/// Open a new presentation ///'
+    printlog "Open a new presentation"
     Call  hNewDocument
-    '/// Paste the slide from the clipboard ///'
+    printlog "Paste the slide from the clipboard!"
     kontext "Slides"
     hUseAsyncSlot( "EditPaste" )
-    '/// Delete the first slide ///'
+    printlog "Delete the first slide"
     hUseAsyncSlot( "EditDeleteSlide" )
-    '/// Check if all three objects exists, and has the right values ///'
+    printlog "Check if all three objects exists, and has the right values"
     kontext "DocumentImpress"
     hTypeKeys "<ESCAPE>"
     hTypeKeys "<TAB>", 1 'Select the first object.
@@ -263,7 +263,7 @@ testcase tiSlideCopyNewPresentation
         Warnlog "Wrong object or object-name! The name found was: " + value13
     endif
 
-    '/// Close the bars we opened before. ///'
+    printlog "Close the bars we opened before."
     kontext "Connectorsbar"
     if Connectorsbar.Exists then Connectorsbar.Close
     kontext "SymbolShapes"
@@ -271,7 +271,7 @@ testcase tiSlideCopyNewPresentation
     kontext "StarShapes"
     if StarShapes.Exists then StarShapes.Close
 
-    '/// Close Presentation. End testcase ///'
+    printlog "Close Presentation. End testcase"
     Call hCloseDocument
 endcase 'tiSlideCopyNewPresentation
 
@@ -531,17 +531,17 @@ testcase tiSlideCopyPasteSpecial
     Dim value1 as string
     Dim value2 as string
     Dim value3 as string
-    '/// Copies slide, and pastes it with "Paste Special", ///'
-    '/// just to see if the office can handle it ///'
-    '/// Make new presentation ///'
+    printlog "Copies slide, and pastes it with Paste Special"
+    printlog "just to see if the office can handle it"
+    printlog "Make new presentation"
     Call  hNewDocument
-    '/// Insert three objects: Connector, Door-plate, and Smiley ///'
+    printlog "Insert three objects: Connector, Door-plate, and Smiley"
 
-    '1 Insert Connector.
+    printlog "Insert Connector"
     kontext "Toolbar"
     sleep 1
     try
-        Verbinder.TearOff  ' insert connector
+        Verbinder.TearOff  
     catch
         warnlog "bug for GH from FHA; .tearoff doesnt tell success"
     endcatch
@@ -556,11 +556,11 @@ testcase tiSlideCopyPasteSpecial
     kontext "DocumentImpress"
     hMouseClick DocumentImpress, 90, 90
 
-    '2 Insert Door-plate.
+    printlog "Insert Door-plate"
     kontext "Toolbar"
     sleep 1
     try
-        StarShapes.TearOff  ' insert connector
+        StarShapes.TearOff 
     catch
         warnlog "bug for GH from FHA; .tearoff doesnt tell success"
     endcatch
@@ -575,11 +575,11 @@ testcase tiSlideCopyPasteSpecial
     kontext "DocumentImpress"
     hMouseClick DocumentImpress, 90, 90
 
-    '3 Insert Smiley.
+    printlog "Insert Smiley"
     kontext "Toolbar"
     sleep 1
     try
-        SymbolShapes.TearOff  ' insert connector
+        SymbolShapes.TearOff
     catch
         warnlog "bug for GH from FHA; .tearoff doesnt tell success"
     endcatch
@@ -591,7 +591,7 @@ testcase tiSlideCopyPasteSpecial
     gMouseMove  (70,70,89,89)
     gMouseUp (89,89)
 
-    '/// Copy the slide to the clipboard ///'
+    printlog "Copy the slide to the clipboard"
     kontext "Slides"
     SlidesControl.TypeKeys "<PAGEUP>"
     SlidesControl.TypeKeys "<SHIFT F10>"
@@ -603,12 +603,12 @@ testcase tiSlideCopyPasteSpecial
         Goto Endsub
     endif
 
-    '/// Try to paste special. And check that the office still stays alive ///'
+    printlog "Try to paste special. And check that the office still stays alive"
     EditPasteSpecial
     kontext "InhaltEinfuegen"
     InhaltEinfuegen.OK
 
-    '/// Close the bars we opened before. ///'
+    printlog "Close the bars we opened before"
     kontext "Connectorsbar"
     if Connectorsbar.Exists then Connectorsbar.Close
     kontext "SymbolShapes"
@@ -618,12 +618,13 @@ testcase tiSlideCopyPasteSpecial
 
     sleep 1
     kontext "DocumentImpress"
-    '/// Close Presentation. End testcase ///'
+    printlog "Close Presentation. End testcase"
 
     Call hCloseDocument
 endcase 'tiSlideCopyPasteSpecial
 
 '-----------------------------------------------------------------------
+
 testcase tiSlideCopyInSlideSorter
     qaerrorlog "#i58418#: Pasting in slide sorter sets slide to wrong position"
     goto endsub
@@ -631,10 +632,10 @@ testcase tiSlideCopyInSlideSorter
     Dim value1 as string
     Dim value2 as string
     Dim value3 as string
-    '/// Copies slides within the slidesorter, and makes sure they are pasted on the correct position ///'
-    '/// Make new presentation ///'
+    printlog "Copies slides within the slidesorter, and makes sure they are pasted on the correct position"
+    printlog "Make new presentation"
     Call  hNewDocument
-    '/// Insert an object: Connector, on the first slide ///'
+    printlog "Insert an object: Connector, on the first slide"
     kontext "Toolbar"
     sleep 1
     try
@@ -653,12 +654,9 @@ testcase tiSlideCopyInSlideSorter
     gMouseMove (10,10,30,30)
     gMouseUp (30,30)
     Printlog "   Inserted a Connector-object."
-    'Rename object
     hTypeKeys "<ESCAPE>"
     hTypeKeys "<TAB>", 1
     DocumentImpress.TypeKeys "<SHIFT F10>"
-
-    'Rename
     if hMenuFindSelect(27027, true, 14) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -668,15 +666,14 @@ testcase tiSlideCopyInSlideSorter
     NameField.SetText "First"
     NameDlgObject.OK
     sleep 1
-    Printlog "   Renamed a the object to 'First'"
+    Printlog "Renamed a the object to 'First'"
 
     sleep 3
-    '/// Rename slide to "1" ///'
+    printlog "Rename slide to 1"
     kontext "Slides"
     SlidesControl.TypeKeys "<PAGEUP>"
     SlidesControl.TypeKeys "<SHIFT F10>"
     sleep 3
-    'Rename
     if hMenuFindSelect(27268, true, 2) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -687,25 +684,24 @@ testcase tiSlideCopyInSlideSorter
     NameField.SetText "1"
     NameDlgPage.OK
     sleep 1
-    Printlog "   Renamed the Slide to '1'"
+    Printlog "Renamed the Slide to '1'"
 
     kontext "DocumentImpress"
     hMouseClick DocumentImpress, 90, 90
     sleep 3
 
-    '/// Insert a new slide ///'
+    printlog "Insert a new slide"
     kontext "Slides"
     SlidesControl.TypeKeys "<TAB><PAGEDOWN>"
     SlidesControl.OpenContextMenu
     sleep 3
-    'Insert slide
     if hMenuFindSelect(27014, true, 1) = false then
         Warnlog "Context-Menu-entry `Insert slide` was not found. Therefore the test ends."
         Call hCloseDocument
         Goto Endsub
     endif
-    Printlog "   Inserted a new slide."
-    '/// Insert an object: Door-plate, on the second slide ///'
+    Printlog "Inserted a new slide."
+    printlog "Insert an object: Door-plate, on the second slide"
     kontext "Toolbar"
     sleep 1
     try
@@ -721,13 +717,10 @@ testcase tiSlideCopyInSlideSorter
     gMouseDown (40,40)
     gMouseMove (40,40,60,60)
     gMouseUp (60,60)
-    Printlog "   Inserted a Door-Plate-object."
-
+    Printlog "Inserted a Door-Plate-object."
     hTypeKeys "<ESCAPE>"
     hTypeKeys "<TAB>", 2
     hTypeKeys "<SHIFT F10>"
-
-    ' Rename
     if hMenuFindSelect(27027, true, 15) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -738,16 +731,15 @@ testcase tiSlideCopyInSlideSorter
     NameField.SetText "Second"
     NameDlgObject.OK
     sleep 1
-    Printlog "   Renamed a the object to 'Second'"
+    Printlog "Renamed a the object to 'Second'"
 
     kontext "DocumentImpress"
     hMouseClick DocumentImpress, 90, 90
     sleep 2
-    '/// Rename slide to "2" ///'
+    printlog "Rename slide to 2"
     kontext "Slides"
     SlidesControl.OpenContextMenu
     sleep 3
-    ' Rename
     if hMenuFindSelect(27268, true, 3) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -759,20 +751,18 @@ testcase tiSlideCopyInSlideSorter
     sleep 1
     Printlog "   Renamed the slide '2'"
 
-    '/// Insert a new slide ///'
+    printlog "Insert a new slide"
     kontext "Slides"
     Slidescontrol.TypeKeys "<PAGEDOWN>", 2
     Slidescontrol.TypeKeys "<SHIFT F10>"
     sleep 3
-    'Insert slide
     if hMenuFindSelect(27014, true, 1) = false then
         Warnlog "Context-Menu-entry `Insert slide` was not found. Therefore the test ends."
         Call hCloseDocument
         Goto Endsub
     endif
-    Printlog "   Inserted a new slide."
-
-    '/// Insert an object: Smiley, on the second slide ///'
+    Printlog "Inserted a new slide."
+    printlog "Insert an object: Smiley, on the second slide"
     kontext "Toolbar"
     sleep 1
     try
@@ -788,13 +778,9 @@ testcase tiSlideCopyInSlideSorter
     gMouseMove  (70,70,89,89)
     gMouseUp (89,89)
     Printlog "   Inserted a Smiley-object."
-
-    'Rename object
     hTypeKeys "<ESCAPE>"
     hTypeKeys "<TAB>", 2
     hTypeKeys "<SHIFT F10>"
-
-    'Choose rename.
     if hMenuFindSelect(27027, true, 15) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -804,13 +790,11 @@ testcase tiSlideCopyInSlideSorter
     NameField.SetText "Third"
     NameDlgObject.OK
     Printlog "   Renamed a the object to 'Third'"
-
-    '/// Rename slide to "3" ///'
+    printlog "Rename slide to 3"
     kontext "Slides"
     Slidescontrol.TypeKeys "<PAGEDOWN>", 2
     SlidesControl.OpenContextMenu
     sleep 3
-    ' Rename
     if hMenuFindSelect(27268, true, 3) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -823,7 +807,7 @@ testcase tiSlideCopyInSlideSorter
     sleep 1
     Printlog "   Renamed the slide '3'"
 
-    '/// Close the bars we opened before. ///'
+    printlog "Close the bars we opened before."
     kontext "Connectorsbar"
     if Connectorsbar.Exists then Connectorsbar.Close
     kontext "SymbolShapes"
@@ -831,47 +815,46 @@ testcase tiSlideCopyInSlideSorter
     kontext "StarShapes"
     if StarShapes.Exists then StarShapes.Close
 
-    '/// Change to Slidesorter ///'
+    printlog "Change to Slidesorter"
     kontext "DocumentImpress"
     ViewSlideSorter
 
-    '/// Now we have changed view to the slidesorter ///'
+    printlog "Now we have changed view to the slidesorter"
 
     kontext "Slides"
-    Printlog "   Changed view to 'SlideSorter'"
-    '/// Make sure the last slide is selcted ///'
+    Printlog "Changed view to 'SlideSorter'"
+    printlog "Make sure the last slide is selcted"
     SlidesControl.TypeKeys "<TAB>"
     SlidesControl.TypeKeys "<PAGEDOWN>", 3
 
-    '/// Cut the last slide ///'
+    printlog "Cut the last slide"
     SlidesControl.TypeKeys "<MOD1 X>"
 
-    '/// Make sure the first slide is selected ///'
+    printlog "Make sure the first slide is selected"
     SlidesControl.TypeKeys "<TAB>"
     SlidesControl.TypeKeys "<PAGEUP>", 2
     sleep 1
 
-    '/// Paste the Slide ///'
+    printlog "Paste the Slide"
     kontext "Slides"
     SlidesControl.TypeKeys "<MOD1 V>"
 
-    '/// choose "Before" as specification for where
+    printlog "choose Before as specification for where"
     Kontext "InsertPaste"
     if InsertPaste.Exists(3) then
         Before.Check
         InsertPaste.OK
         Printlog "   Pasted slide 'Before'"
     else
-        warnlog "   Problem when copying/pasting slide."
+        warnlog "Problem when copying/pasting slide."
     endif
 
-    '/// Check where the slide ended up ///'
+    printlog "Check where the slide ended up"
     kontext "Slides"
     SlidesControl.TypeKeys "<TAB>"
     SlidesControl.TypeKeys "<PAGEUP>", 3 'to get to the first slide
     SlidesControl.TypeKeys "<SHIFT F10>"
     sleep 3
-    ' Rename
     if hMenuFindSelect(27268, true, 3) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -888,12 +871,14 @@ testcase tiSlideCopyInSlideSorter
     sleep 1
 
     kontext "Slides"
-    '/// Choose the slide in the middle (named "1") ///'
+    printlog "Choose the slide in the middle (named 1)"
     SlidesControl.TypeKeys "<TAB>"
-    SlidesControl.TypeKeys "<PAGEDOWN>", 3 'to get to the last slide
-    SlidesControl.TypeKeys "<PAGEUP>" 'to go back one step
+    printlog "to get to the last slide"
+    SlidesControl.TypeKeys "<PAGEDOWN>", 3
+    printlog "to go back one step"
+    SlidesControl.TypeKeys "<PAGEUP>" 
     SlidesControl.OpenContextMenu (true)
-    ' Check the name of that slide (via Rename)
+    printlog "Check the name of that slide (via Rename)"
     if hMenuFindSelect(27268, true, 3) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -910,7 +895,7 @@ testcase tiSlideCopyInSlideSorter
     sleep 1
     kontext "Slides"
 
-    '/// Cut the slide ///'
+    printlog "Cut the slide"
     SlidesControl.TypeKeys "<SHIFT F10>"
     sleep 3
     if hMenuFindSelect(5710, true, 10) = false then
@@ -919,18 +904,18 @@ testcase tiSlideCopyInSlideSorter
         Goto Endsub
     endif
 
-    '/// Make sure we have selected the last slide ///'
+    printlog "Make sure we have selected the last slide"
     SlidesControl.TypeKeys "<TAB>"
     SlidesControl.TypeKeys "<PAGEDOWN>", 2
 
-    '/// Place the mousepointer to the left of the first slide ///'
+    printlog "Place the mousepointer to the left of the first slide"
     sleep 1
     kontext "Slides"
     SlidesControl.MouseMove 2, 3
     SlidesControl.OpenContextMenu true
     sleep 3
 
-    '/// Paste the Slide ///'
+    printlog "Paste the Slide"
     if hMenuFindSelect(5712, true, 12) = false then
         Warnlog "Context-Menu-entry `Paste` were not found. Therefore the test ends."
         Call hCloseDocument
@@ -938,7 +923,7 @@ testcase tiSlideCopyInSlideSorter
     endif
     sleep 1
 
-    '/// Choose "After" as specification for where ///'
+    printlog "Choose After as specification for where"
     Kontext "InsertPaste"
     if InsertPaste.Exists(3) then
         After.Check
@@ -948,13 +933,15 @@ testcase tiSlideCopyInSlideSorter
         warnlog "   Problem when copying/pasting slide."
     endif
 
-    '/// Check where the slide ended up. Should have showed up at the last position ///'
+    printlog "Check where the slide ended up. Should have showed up at the last position"
     kontext "Slides"
     SlidesControl.TypeKeys "<TAB>"
-    SlidesControl.TypeKeys "<PAGEDOWN>", 3 'to get to the last slide
-    SlidesControl.TypeKeys "<SHIFT F10>" '= open context menu
+    printlog "to get to the last slide"
+    SlidesControl.TypeKeys "<PAGEDOWN>", 3
+    printlog "open context menu"
+    SlidesControl.TypeKeys "<SHIFT F10>" 
     sleep 3
-    ' Rename
+    printlog "Rename"
     if hMenuFindSelect(27268, true, 3) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
         Call hCloseDocument
@@ -970,10 +957,8 @@ testcase tiSlideCopyInSlideSorter
     NameDlgPage.OK
     sleep 1
 
-    '/// Close Presentation. End testcase ///'
+    printlog "Close Presentation. End testcase"
     Call hCloseDocument
 endcase 'tiSlideCopyInSlideSorter
 
 '------------------------------------------------------------------------
-
-'TODO FHA - Check the objects after pasting them.
diff --git a/testautomation/graphics/optional/includes/impress/i_stylist.inc b/testautomation/graphics/optional/includes/impress/i_stylist.inc
index 7efe28089365..1ef1773a5c55 100644
--- a/testautomation/graphics/optional/includes/impress/i_stylist.inc
+++ b/testautomation/graphics/optional/includes/impress/i_stylist.inc
@@ -29,15 +29,10 @@
 '*
 '* short description :
 '*
-'*******************************************************************
-'*
-' #1 tFormatStylistBackground
-' #1 fGetSetPageBackground
-'*
 '\*******************************************************************
 
 testcase tFormatStylistBackground
-'/// special test for BUG # 96364 "Background style looses functionality over PPT Ex/import" ///'
+    printlog " special test for BUG # 96364 Background style looses functionality over PPT Ex/import"
     dim sFilter (50) as string
     dim sFileList (30) as string
     dim i as integer
@@ -59,7 +54,7 @@ testcase tFormatStylistBackground
         goto endsub
     endif
 
-    '/// if not exists : gOfficePath + '\\user\\impress\\optional\\', create it ///'
+    printlog " if not exists : gOfficePath + '\\user\\impress\\optional\\', create it"
     if app.dir (ConvertPath ( gOfficePath + "user/work/impress") ) = "" then
         app.mkdir ConvertPath ( gOfficePath + "user/work/impress")
     endif
@@ -67,23 +62,23 @@ testcase tFormatStylistBackground
         app.mkdir ConvertPath ( gOfficePath + "user/work/impress/optional")
     endif
 
-    '/// open application ///'
+    printlog " open application"
     Call  hNewDocument
 
     iColor = 10
-    '/// change background color via stylist ///'
+    printlog " change background color via stylist"
     if (iColor <> fGetSetPageBackground (iColor,0)) then
         warnlog "Stylist background was not changed as expected :-( "+iColor
     endif
-    '/// check if it is the same in Format -> Page ///'
+    printlog " check if it is the same in Format -> Page"
     if fGetSetPageBackground (0,1) <> iColor then
         warnlog " First stage error! Difference between stylist and menu entry :-( "+iColor
     endif
 
-    '/// save this in 3 formats: ///'
-    '///+  - StarImpress 5.0 ///'
-    '///+  - StarOffice 6.0 Presentation ///'
-    '///+  - Microsoft PowerPoint 97/2000/XP ///'
+    printlog " save this in 3 formats:"
+    printlog "+  - StarImpress 5.0"
+    printlog "+  - StarOffice 6.0 Presentation"
+    printlog "+  - Microsoft PowerPoint 97/2000/XP"
     FileSaveAs
     sleep 2
     Kontext "SpeichernDlg"
@@ -110,14 +105,14 @@ testcase tFormatStylistBackground
       printlog " saved with filter ("+i+"/3): "+ sFilter(i)
     next i
 
-    '/// close impress ///'
+    printlog "close impress"
     FileClose
     sleep 1
-    kontext ' active about information loss ?
+    kontext 
     if active.exists (5) then active.yes
     sleep 10
 
-    '/// open just saved files ///'
+    printlog " open just saved files"
     sFileName = ConvertPath ( gOfficePath + "user/work/impress/optional/" )
     GetFileList ( sFileName, "isty_*", sFileList() )
 
@@ -127,23 +122,23 @@ testcase tFormatStylistBackground
       hFileOpen ( sFileList(i) )
       Sleep 5
       If hIsNamedDocLoaded (sFileList(i)) Then
-         printlog "  used filter: " + hGetUsedFilter()
+         printlog "used filter: " + hGetUsedFilter()
       else
          warnlog "document didn't get loaded"
       endif
       sleep 5
-      '/// check if stylist, menue and prediction are as expected ///'
+      printlog " check if stylist, menue and prediction are as expected"
      iColor = 10
       if ((fGetSetPageBackground (0,0) <> iColor) OR (fGetSetPageBackground (0,1) <> iColor)) then
          warnlog "Background was not as expected on loading :-( "+iColor
       endif
       iColor = 20
-      '/// change background in stylist ///'
+      printlog " change background in stylist"
       if (fGetSetPageBackground (iColor,0) <> iColor) then
          warnlog "Stylist background was not changed as expected :-( "+iColor
       endif
       sleep 1
-      '/// check if background is same in format menu ///'
+      printlog " check if background is same in format menu"
       if (fGetSetPageBackground (0,1) <> iColor) then
          warnlog "Format menu background is wrong :-( "+iColor
       endif
@@ -151,7 +146,7 @@ testcase tFormatStylistBackground
       hCloseDocument
       sleep 2
     next i
-endcase
+endcase 'tFormatStylistBackground
 
 '------------------------------------------------------------------------------
 
diff --git a/testautomation/graphics/optional/includes/impress/i_view.inc b/testautomation/graphics/optional/includes/impress/i_view.inc
index e82ec2ec38a3..214676c3b1a0 100644
--- a/testautomation/graphics/optional/includes/impress/i_view.inc
+++ b/testautomation/graphics/optional/includes/impress/i_view.inc
@@ -41,31 +41,35 @@
 
 testcase tAnsichtHintergrundNotizen
     Printlog "- View background notes"
-    Call hNewDocument						'/// new document ///'
+    printlog "new document"
+    Call hNewDocument
     try
-        ViewNotes					'/// view background notes ///'
+        printlog "view background notes"
+        ViewNotes					
         sleep 3
     catch
         Warnlog  "View-Notes could not be accessed"
     endcatch
     ViewWorkspaceDrawingView
     sleep 1
-    Call hCloseDocument						'/// close document ///'
+    printlog "close document"
+    Call hCloseDocument						
     sleep 1
-endcase
+endcase 'tAnsichtHintergrundNotizen
 
 '-------------------------------------------------------------------------------
 
 testcase tViewWorkspaceHandoutView
     Printlog "- View background handout"
-    Call hNewDocument						'/// new document ///'
+    printlog "new document"
+    Call hNewDocument						
     sleep 2
     Kontext "DocumentImpress"
     DocumentImpress.UseMenu
     hMenuSelectNr (5)
     hMenuSelectNr (13)
     Printlog "  ViewWorkspaceHandoutView"
-    ViewWorkspaceHandoutView						'/// view background handout ///'
+    ViewWorkspaceHandoutView						
     sleep 2
     Kontext "Tasks"
     sleep 2
@@ -75,9 +79,11 @@ testcase tViewWorkspaceHandoutView
         Printlog "  ViewWorkspaceHandoutView works"
     end if
     Printlog "ViewWorkspaceHandoutView closed"
-    ViewWorkspaceDrawingView						'/// back to view background drawing ///'
-    Call hCloseDocument						'/// close document ///'
-endcase
+    printlog "back to view background drawing"
+    ViewWorkspaceDrawingView
+    printlog "close document"
+    Call hCloseDocument						
+endcase 'tViewWorkspaceHandoutView
 
 '-------------------------------------------------------------------------------
 
@@ -87,67 +93,67 @@ testcase tViewWorkspaceOutlineView
    dim sFile as string
    dim i as integer
 
-   '/// load a document with heading styles in writer and use the function 'writer:'File->Send->Outline to presentation' to get it into the presentation ///'
+   printlog "load a document with heading styles in writer and use the function 'writer:'File->Send->Outline to presentation' to get it into the presentation"
    ' all 'heading 1' are new slides
 
-   '/// document used : "graphics\\required\\input\\outlinefromwriter.sxw" -> you get into writer ///'
+   printlog "document used : graphics\\required\\input\\outlinefromwriter.sxw -> you get into writer"
    sFile = ConvertPath (gTesttoolPath + "graphics\required\input\outlinefromwriter.sxw")
    hDateiOeffnen (sFile)
    sleep 10
-   '///+ with 'File->Send->Outline to presentation' you get into impress ///'
+   printlog "with 'File->Send->Outline to presentation' you get into impress"
    FileSendOutlineToPresentation
    sleep 10
-   Printlog "'/// View->Workspace->Outline View ///'"
+   Printlog "printlog View->Workspace->Outline View"
    ViewWorkspaceOutlineView
    sleep 1
-   '/// go to the line with the 'I' (via 'search & replace' function) ///'
+   printlog "go to the line with the 'I' (via 'search & replace' function)"
    hTypeKeys "<STRG HOME>"
    EditSelectAll
    hFindeImDokument ("I")
 
-   '///<b> expected level/style: 'Outline 8' </b>///'
-   '/// get last character from selected style in stylist (expect a number of the outline(heading level) ///'
+   printlog "expected level/style: 'Outline 8'"
+   printlog "get last character from selected style in stylist (expect a number of the outline(heading level)"
    fGetPresentationStyle ("8")
 
-   '/// type keys [home] [tab] to go one level down ///'
+   printlog "type keys [home] [tab] to go one level down"
    Kontext "DocumentImpressOutlineView"
    DocumentImpressOutlineView.TypeKeys "<Home><Tab>"
 
-   '///<b> expected level/style: 'Outline 9' </b>///'
+   printlog "expected level/style: 'Outline 9'"
    fGetPresentationStyle ("9")
 
    Kontext "DocumentImpressOutlineView"
-   '/// Edit - "Select All" to go select the whole text ///'
+   printlog "Edit - Select All to go select the whole text"
    EditSelectAll
-   '/// type keys [shift]+[tab] eight times, to get all lines to the highest, except the one with the 'I' ///'
+   printlog "type keys [shift]+[tab] eight times, to get all lines to the highest, except the one with the 'I'"
    DocumentImpressOutlineView.TypeKeys ("<Shift Tab>", 8)
     
 hPrepareSearchBUG
     hTypeKeys "<STRG HOME>"
     EditSelectAll
     hFindeImDokument ("I")
-    '///<b> expected level/style: 'Outline 1' </b>///'
+    printlog "expected level/style: 'Outline 1"
     fGetPresentationStyle ("1")
     
-    '/// type keys [shift]+[tab] to get the last line to the highest level, too ///'
+    printlog "type keys [shift]+[tab] to get the last line to the highest level, too"
     Kontext "DocumentImpressOutlineView"
     DocumentImpressOutlineView.TypeKeys ("<Shift Tab>", 1)
-    '///<b> expected level/style: 'Title' </b>///'
+    printlog "expected level/style: 'Title'"
     fGetPresentationStyle (0)
     
     Kontext "DocumentImpressOutlineView"
     DocumentImpressOutlineView.TypeKeys ("<escape>", 1)
-    Printlog "'///<b> call 'Edit->Undo' nine times </b>///'"
+    Printlog "call 'Edit->Undo' nine times"
     for i = 1 to 9
       editundo
     next i
 
 hPrepareSearchBUG
     hFindeImDokument ("I")
-    '///<b> expected level/style: 'Outline 9' </b>///'
+    printlog "expected level/style: 'Outline 9'"
     fGetPresentationStyle (9)
     
-    Printlog "'///<b> call 'Edit->Redo' nine times </b>///'"
+    Printlog "call 'Edit->Redo' nine times "
     for i = 1 to 9
       editredo
     next i
@@ -162,10 +168,10 @@ hPrepareSearchBUG
     hTypeKeys "<STRG HOME>"
     EditSelectAll
     hFindeImDokument ("I")
-    '///<b> expected level/style: 'Title' </b>///'
+    printlog "expected level/style: 'Title'"
     fGetPresentationStyle (0)
 
-    Printlog "'///<b> call 'Edit->Undo' nine times </b>///'"
+    Printlog "call 'Edit->Undo' nine times"
     for i = 1 to 9
         editundo
     next i
@@ -174,13 +180,13 @@ hPrepareSearchBUG
     hTypeKeys "<STRG HOME>"
     EditSelectAll
     hFindeImDokument ("I")
-    '///<b> expected level/style: 'Outline 9' </b>///'
+    printlog "expected level/style: 'Outline 9"
     fGetPresentationStyle (9)
 
-    '/// type keys [strg]+[A] ///'
+    printlog "type keys [strg]+[A]"
     Kontext "DocumentImpressOutlineView"
     EditSelectAll
-    '/// type keys [strg]+[X] ///'
+    printlog "type keys [strg]+[X]"
     DocumentImpressOutlineView.TypeKeys "<mod1 X>"
 
     kontext
@@ -191,17 +197,17 @@ hPrepareSearchBUG
         Warnlog "messagebox missing ! (about deleting pages with graphic objects:)"
     endif
 
-   '/// 'Edit->Undo' ///'
+   printlog "'Edit->Undo'"
     editundo
-   '/// 'Edit->Redo' ///'
+   printlog "'Edit->Redo'"
     editredo
-   '/// 'Edit->Undo' ///'
+   printlog "'Edit->Undo'"
     editundo
 
-   '/// type keys [strg]+[A] ///'
+   printlog "type keys [strg]+[A]"
    Kontext "DocumentImpressOutlineView"
    EditSelectAll
-   '/// type keys [strg]+[X] ///'
+   printlog "type keys [strg]+[X]"
    DocumentImpressOutlineView.TypeKeys "<mod1 X>"
 
     kontext
@@ -212,23 +218,23 @@ hPrepareSearchBUG
         Warnlog "messagebox missing ! (about deleting pages with graphic objects:)"
     endif
 
-    '/// type keys [strg]+[V] ///'
+    printlog "type keys [strg]+[V]"
     Kontext "DocumentImpressOutlineView"
     DocumentImpressOutlineView.TypeKeys "<mod1 V>"
 
-    '/// 'Edit->Undo' ///'
+    printlog "'Edit->Undo'"
     editundo
-    '/// 'Edit->Redo' ///'
+    printlog "'Edit->Redo'"
     editredo
 
-    '/// type keys [strg]+[End] ///'
+    printlog "type keys [strg]+[End]"
     Kontext "DocumentImpressOutlineView"
     DocumentImpressOutlineView.TypeKeys "<mod1 End>"
-    '/// type keys [strg]+[V] ///'
+    printlog "type keys [strg]+[V]"
     DocumentImpressOutlineView.TypeKeys "<mod1 V>"
-    '/// type keys [strg]+[A] ///'
+    printlog "type keys [strg]+[A]"
     EditSelectAll
-    '/// type keys [delete] ///'
+    printlog "type keys [delete]"
     DocumentImpressOutlineView.TypeKeys "<delete>"
 
     kontext
@@ -240,7 +246,7 @@ hPrepareSearchBUG
         Warnlog "messagebox missing ! (about deleting pages with graphic objects:)"
         endif
 
-    '/// type keys [strg]+[A] ///'
+    printlog "type keys [strg]+[A]"
     Kontext "DocumentImpressOutlineView"
     EditSelectAll
     try
@@ -250,7 +256,7 @@ hPrepareSearchBUG
         Warnlog "error 4711 TBO :-("
     endcatch
     
-    '/// type keys [delete] ///'
+    printlog "type keys [delete]"
     Kontext "DocumentImpressOutlineView"
     DocumentImpressOutlineView.TypeKeys "<delete>"
 
@@ -273,44 +279,50 @@ hPrepareSearchBUG
     endcatch
     
     ViewWorkspaceDrawingView
-    Call  hCloseDocument						'/// close document ///'
-    Call  hCloseDocument						'/// close document ///'
-endcase
+    printlog "close document"
+    Call  hCloseDocument						
+endcase 'tViewWorkspaceOutlineView
 
 '-------------------------------------------------------------------------------
 
 testcase tViewWorkspaceDrawingView
     Printlog "- View/Background-drawing"
-    Call hNewDocument						'/// new document ///'
+    printlog "new document"
+    Call hNewDocument						
     sleep 2
-    ViewDrawing						'/// view background drawing ///'
+    printlog "view background drawing"
+    ViewDrawing						
     try
-        hRechteckErstellen ( 20,20,40,40 )			'/// create rectangle ///'
+        printlog "create rectangle"
+        hRechteckErstellen ( 20,20,40,40 )			
         sleep 1
         Printlog "  - rectangle created"
     catch
         Warnlog "  Rectangle could not be created"
     endcatch
-    Call hCloseDocument						'/// close document ///'
-endcase
+    printlog "close document"
+    Call hCloseDocument		
+endcase 'tViewWorkspaceDrawingView
 
 '-------------------------------------------------------------------------------
 
 testcase tAnsichtEbene
-    printLog "- View/Layer"							'/// view layer ///'
-    
-    
-    FileAutopilotPresentation					'/// new document-autopilot ///'
+    printLog "- View/Layer"							
+
+    printlog "new document-autopilot"
+    FileAutopilotPresentation					
     Kontext "AutopilotPraesentation1"
     sleep 5
     AutopilotPraesentation1.Ok
     sleep 2
     sleep 2
-    ViewSlide							'/// back to view slide ///'
+    printlog "back to view slide"
+    ViewSlide							
     Sleep 2
-    
-    Call  hCloseDocument						'/// close document ///'
 
-endcase
+    printlog "close document"
+    Call  hCloseDocument						
+
+endcase 'tAnsichtEbene
 
 '-------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/impress/options.inc b/testautomation/graphics/optional/includes/impress/options.inc
index cfce04e68805..d67eaea8d195 100644
--- a/testautomation/graphics/optional/includes/impress/options.inc
+++ b/testautomation/graphics/optional/includes/impress/options.inc
@@ -41,8 +41,7 @@ function tiPEngineOptionsTest
     dim lala, optsound, os, oa, odc, ota, ets, etspeed, etrep, etshap, etgt as integer
 
      Kontext "Tasks"
-'     if (NOT bError) then
-        '/// CLick on button '...' (Options) ///'
+        printlog "CLick on button '...' (Options)"
         EffectOptions.Click
         kontext "TabEffect"
         if TabEffect.Exists(5) then
@@ -56,13 +55,6 @@ function tiPEngineOptionsTest
                   kontext "TabEffect"
                else
                   kontext "TabEffect"
-'                  if play.isEnabled then
-'                     try
-'                        play.click
-'                     catch
-'                        warnlog Sound.GetSelText + " wasn't played correctly."
-'                     endcatch
-'                  endif
                endif
            next os
            if AfterAnimation.isEnabled AND AfterAnimation.isVisible then
@@ -89,7 +81,7 @@ function tiPEngineOptionsTest
            for ota = 1 to TextAnimation.GetItemCount
                TextAnimation.Select ota
            next ota
-           '/// switch to TabPage 'Timing' ///'
+           printlog "switch to TabPage 'Timing'"
            Kontext
            Active.SetPage TabTiming
            kontext "TabTiming"
@@ -130,7 +122,7 @@ function tiPEngineOptionsTest
            else
               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"
@@ -163,9 +155,9 @@ function tiPEngineOptionsTest
            warnlog "Impress:Tasks Pane:Custom Animation:... button didn't work."
         endif
         Kontext "Tasks"
-end function
-
+end function 'tiPEngineOptionsTest
 
+'-------------------------------------------------------------------------------
 
 function optionstest2
     dim filedialogue as boolean
@@ -188,7 +180,7 @@ function optionstest2
            else
               Warnlog "DelayBetweenCharacters should have been enabled"
            endif
-           '/// switch to TabPage 'Timing' ///'
+           printlog "switch to TabPage 'Timing'"
            Kontext
            Active.SetPage TabTiming
            kontext "TabTiming"
@@ -234,7 +226,7 @@ function optionstest2
            else
               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"
@@ -267,4 +259,4 @@ function optionstest2
            warnlog "Impress:Tasks Pane:Custom Animation:... button didn't work."
         endif
         Kontext "Tasks"
-end function
+end function 'optionstest2
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc
index 5e2b4912f6e7..fee150c8381a 100644
--- a/testautomation/graphics/required/includes/global/id_001.inc
+++ b/testautomation/graphics/required/includes/global/id_001.inc
@@ -82,9 +82,9 @@ testcase tiFileSaveAs
 
     sFilter (0) = 0 ' initalize ;-)...
     printlog " used document: graphics\required\input\tbo_alf_.od?"
-    sFileName = "graphics\required\input\tbo_alf_." + ExtensionString    ' this is the file with all features
+    sFileName = "graphics\required\input\tbo_alf_." + ExtensionString
     printlog "FileName is " + sFileName
-    sFile = "isas_"                                ' this is the filename of the export files
+    sFile = "isas_"
     sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform) ' this is the export path
     printlog "sPath is " + sPath
     if dir (sPath) = "" then
@@ -92,7 +92,7 @@ testcase tiFileSaveAs
     end if
 
     printlog " deleting all files in output directory: \\user\\work\\graphics\\required\\gApplication gPlatform isas_*"
-    if gSamePC = TRUE then ' delete export directory
+    if gSamePC = TRUE then 
         GetFileList ( sPath, sFile+"*", Exlist() )
         if KillFileList ( Exlist() ) <> TRUE then
             Warnlog "Couldn't delete all Files in Output-Export-Directory, the followings are still there:"
@@ -107,7 +107,7 @@ testcase tiFileSaveAs
     WaitSlot (3000)
     
     printlog "running 5 times save as with different Filters"
-    for i = 1 to 6 'run it 5 times
+    for i = 1 to 6
         printlog "calling Save as Dialog"
         FileSaveAs
         WaitSlot (2000)
diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc
index 42b0170fe6ef..a14912c6f141 100644
--- a/testautomation/graphics/required/includes/global/id_004.inc
+++ b/testautomation/graphics/required/includes/global/id_004.inc
@@ -307,11 +307,11 @@ testcase tiInsertChart
     InsertChart
     WaitSlot (2000)
     Kontext "Messagebox"
-        if Messagebox.Exists then
-            Warnlog Messagebox.GetText
-            Messagebox.OK
-            sleep 1
-        end if
+    if Messagebox.Exists then
+        Warnlog Messagebox.GetText
+        Messagebox.OK
+        sleep 1
+    end if
     gMouseClick 1,1
     sleep 2
     printlog "close application "
@@ -360,17 +360,17 @@ testcase tiInsertSpreadsheet
     InsertSpreadsheetDraw
     WaitSlot (2000)
     Kontext "Messagebox"
-        if Messagebox.Exists (5) then
-            Warnlog Messagebox.GetText
-            Messagebox.OK
-        end if
-        sleep 2
-        printlog "click somewhere out of the object, to deselect it "
-        gMouseClick 1,1
-        sleep 1
-        printlog "select and delete object with keys: <Tab><Delete> "
-        hTypekeys "<Tab><Delete>"
-        sleep 2
+    if Messagebox.Exists (5) then
+        Warnlog Messagebox.GetText
+        Messagebox.OK
+    end if
+    sleep 2
+    printlog "click somewhere out of the object, to deselect it "
+    gMouseClick 1,1
+    sleep 1
+    printlog "select and delete object with keys: <Tab><Delete> "
+    hTypekeys "<Tab><Delete>"
+    sleep 2
     printlog "close application "
     Call hCloseDocument
     
diff --git a/testautomation/graphics/required/includes/global/id_005.inc b/testautomation/graphics/required/includes/global/id_005.inc
index 6ec5a5988235..cba38479f34b 100644
--- a/testautomation/graphics/required/includes/global/id_005.inc
+++ b/testautomation/graphics/required/includes/global/id_005.inc
@@ -54,7 +54,7 @@ sub id_005
     call tiFormatFontwork
     call tiFormatGroup
     printlog " format->group is also modify->group "
-    '        tiFormatLayer ' not in impress
+
 end sub
 '------------------------------------------------------------------------------
 testcase tiFormatDefault
diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc
index ccdfc5eb3e69..1b3a8b3c39a9 100644
--- a/testautomation/graphics/required/includes/global/id_006.inc
+++ b/testautomation/graphics/required/includes/global/id_006.inc
@@ -43,19 +43,21 @@ sub id_Tools
     call tiToolsEyedropper    
     call tToolsOptionsTest ' global one
 end sub
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsSpellchecking
 
     if not gOOO then ' Spellcheck doesn't work in OOo builds.
-        '/// open application ///'
+        printlog "open application"
            Call hNewDocument
-            WaitSlot (2000)    'sleep 2
-        '/// call subroutine 'hSetSpellHypLanguage' for setting the default language in th eoptions, to enable it for languages, which don't provide a dictionary (usually asian ones) ///'
+            WaitSlot (2000) 
+        printlog " call subroutine 'hSetSpellHypLanguage' for setting the default language in th eoptions, to enable it for languages, which don't provide a dictionary (usually asian ones)"
            call hSetSpellHypLanguage
-        '/// create textframe with content ///'
+        printlog "create textframe with content"
            Call hTextrahmenErstellen ("Whaaaat", 10, 10, 30, 40)
            sleep 1
-        '/// Tools->Spellcheck->Check ///'
+        printlog "Tools->Spellcheck->Check"
            ToolsSpellCheck
             WaitSlot (1000)    'sleep 1
             Kontext "MessageBox"
@@ -67,14 +69,14 @@ testcase tiToolsSpellchecking
                     Kontext "Rechtschreibung"
                         if Rechtschreibung.exists then
                             Call DialogTest ( Rechtschreibung )
-                            '/// close dialog 'Spellcheck' ///'
+                            printlog "close dialog 'Spellcheck'"
                             Rechtschreibung.Close
                         else
                             warnlog " Spellcheck dialog didn't came up :-("
                         end if
                 end if
                 sleep 1
-                '/// say OK to messagebox about 'Spellcheck has been completed' ///'
+                printlog "say OK to messagebox about 'Spellcheck has been completed'"
                 Kontext "Messagebox"
                 if Messagebox.exists (5) then
                     warnlog "Shouldn't be any messagebox after pressing close in spellchecker"
@@ -82,26 +84,30 @@ testcase tiToolsSpellchecking
                     sleep (2)
                     Kontext
                 end if
-            '/// close application ///'
+            printlog "close application"
         Call hCloseDocument
     else goto endsub
     endif
-endcase
+endcase 'tiToolsSpellchecking
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsSpellcheckingAutomatic
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// Tools->Spellcheck->AutoSpellcheck ///'
+    printlog "Tools->Spellcheck->AutoSpellchec"
     ToolsSpellcheckAutoSpellcheck
-    '/// create textframe with text ///'
+    printlog " create textframe with text "
     Call hTextrahmenErstellen ("What", 10, 10, 30, 40)
     sleep 2
-    '/// Tools->Spellcheck->AutoSpellcheck ///'
+    printlog "Tools->Spellcheck->AutoSpellcheck "
     ToolsSpellcheckAutoSpellcheck
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsSpellcheckingAutomatic
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsThesaurus
     Dim sWord as string
     Dim sExt as string
@@ -164,9 +170,7 @@ testcase tiToolsThesaurus
                      sWord = "Hello"
                   endif
     end select
-
     PrintLog "Thesaurus with 1 word: " + sWord
-
     if( gApplication = "DRAW" ) then
         sExt = ".odg"
     elseif( Ucase(gApplication) = "IMPRESS" ) then
@@ -176,7 +180,6 @@ testcase tiToolsThesaurus
     hFileOpenLocally( gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt)
     Call hTextrahmenErstellen (sWord,20,20,50,30)
     sleep 1
-
     printlog "select the word"
     hTypeKeys "<Home><SHIFT END>"
 
@@ -195,132 +198,138 @@ testcase tiToolsThesaurus
          warnlog "the thesaurus does not appear"
     end if
     Call hCloseDocument
-endcase
+endcase 'tiToolsThesaurus
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsHyphenation
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// Tools->Hyphenation ///'
+    printlog "Tools->Hyphenation "
     ToolsLanguageHyphenationDraw
-    WaitSlot (2000)    'sleep 2
-    '/// Tools->Hyphenation ///'
+    WaitSlot (2000)
+    printlog "Tools->Hyphenation "
     ToolsLanguageHyphenationDraw
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsHyphenation
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsAutoCorrect
     dim iLanguage as integer ' for resetting the language
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    WaitSlot (1000)    'sleep 1
-    '/// Tools->Autocorrect ///'
+    WaitSlot (1000)   
+    printlog "Tools->Autocorrect "
     ToolsAutocorrect
-    WaitSlot (2000)    'sleep 1
+    WaitSlot (2000) 
     Kontext
-    '/// select tabpage 'Replace' ///'
+    printlog "select tabpage 'Replace' "
     Messagebox.SetPage TabErsetzung
     Kontext "TabErsetzung"
-        Call DialogTest ( TabErsetzung )
-        '/// remember the language, that is selected in the 'Replacements and exceptions for Language' Listbox ///'
-        iLanguage = WelcheSprache.GetSelIndex
-        '///+ change the language to the 1st from the top ///'
-        WelcheSprache.Select 1 ' select language with empty list
-        '///+ type something into the field 'replace' ///'
-        Kuerzel.SetText "a"
-        '///+ type something into the field 'with' ///'
-        ErsetzenDurch.SetText "b"
-        '///+ click button 'new' ///'
-        Neu.Click
-        sleep 1
-        '///+ click button 'delete' ///'
+    Call DialogTest ( TabErsetzung )
+    printlog "remember the language, that is selected in the 'Replacements and exceptions for Language' Listbox "
+    iLanguage = WelcheSprache.GetSelIndex
+    printlog "+ change the language to the 1st from the top "
+    WelcheSprache.Select 1 ' select language with empty list
+    printlog "+ type something into the field 'replace' "
+    Kuerzel.SetText "a"
+    printlog "+ type something into the field 'with' "
+    ErsetzenDurch.SetText "b"
+    printlog "+ click button 'new' "
+    Neu.Click
+    sleep 1
+    printlog "+ click button 'delete' "
+    Loeschen.Click
+    sleep 1
+    try
+        printlog "+ click button 'delete' again "
         Loeschen.Click
-        sleep 1
-        try
-            '///+ click button 'delete' again ///'
-            Loeschen.Click
-        catch
-            printlog "ok was CRASH before" '#
-        endcatch
-        '///+ if nothing happens it is ok, was a Crash before :-( ///'
-        '///+ restore cthe remembered language ///'
-        WelcheSprache.select (iLanguage)
-        Kontext
-        '/// select tabpage 'Exception' ///'
-        Messagebox.SetPage TabAusnahmen
-            Kontext "TabAusnahmen"
-            Call DialogTest ( TabAusnahmen )
-            '/// type something into the field 'Abbreviations' ///'
-            Abkuerzungen.settext "Lala"
-            '///+ click button 'new' in 'Abbreviations' ///'
-            AbkuerzungenNeu.click
-            '///+ click button 'delete' in 'Abbreviations' ///'
-            AbkuerzungenLoeschen.click
-            '/// type something into the field 'Word with TWo INitial CApitals' ///'
-            Woerter.settext "LALA"
-            '///+ check the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' ///'
-            WoerterAutomatisch.Check
-            '///+ click button 'new' in 'Word with TWo INitial CApitals' ///'
-            WoerterNeu.click
-            '///+ click button 'delete' in 'Word with TWo INitial CApitals' ///'
-            WoerterLoeschen.click
-            '///+ UNcheck the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' ///'
-            WoerterAutomatisch.UnCheck
-            Kontext
-            '/// select tabpage 'Options' ///'
-            Messagebox.SetPage TabOptionen
-                Kontext "TabOptionen"
-                Call DialogTest ( TabOptionen )
-                Kontext
-            '/// select tabpage 'Custom Quotes' ///'
-            Messagebox.SetPage TabLocalizedOptions
-                Kontext "TabLocalizedOptions"  ' 1a
-                    '/// in the part of 'single quotes': ///'
-                    '///+ check 'replace' ///'
-                    '///+ click 'start quote' ///'
-                    SingleQuotesReplace.Check
-                    SingleQuotesStart.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 1 )
-                        '///+  cancel dialog 'start quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 1b
-                    '///+ click 'end quote' ///'
-                    SingleQuotesEnd.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 2 )
-                        '///+  cancel dialog 'end quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 1s
-                    '///+ click button 'default' ///'
-                    SingleQuotesDefault.Click
-
-                Kontext "TabLocalizedOptions"  ' 2a
-                    '/// in the part of 'double quotes': ///'
-                    '///+ click 'start quote' ///'
-                    DoubleQuotesStart.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 3 )
-                        '///+  cancel dialog 'start quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 2b
-                    '///+ click 'end quote' ///'
-                    DoubleQuotesEnd.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 4 )
-                        '///+  cancel dialog 'end quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 2s
-                    '///+ click button 'default' ///'
-                    DoubleQuotesDefault.Click
-                    '///+ UNcheck 'replace' ///'
-                    SingleQuotesReplace.UnCheck
-                    '/// cancel dialog 'AtorCorrect' ///'
-                    TabLocalizedOptions.cancel
-    '/// close application ///'
+    catch
+        printlog "ok was CRASH before"
+    endcatch
+    printlog "+ if nothing happens it is ok, was a Crash before :-( "
+    printlog "+ restore cthe remembered language "
+    WelcheSprache.select (iLanguage)
+    Kontext
+    printlog "select tabpage 'Exception' "
+    Messagebox.SetPage TabAusnahmen
+    Kontext "TabAusnahmen"
+    Call DialogTest ( TabAusnahmen )
+    printlog "type something into the field 'Abbreviations' "
+    Abkuerzungen.settext "Lala"
+    printlog "+ click button 'new' in 'Abbreviations' "
+    AbkuerzungenNeu.click
+    printlog "+ click button 'delete' in 'Abbreviations' "
+    AbkuerzungenLoeschen.click
+    printlog "type something into the field 'Word with TWo INitial CApitals' "
+    Woerter.settext "LALA"
+    printlog "+ check the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' "
+    WoerterAutomatisch.Check
+    printlog "+ click button 'new' in 'Word with TWo INitial CApitals' "
+    WoerterNeu.click
+    printlog "+ click button 'delete' in 'Word with TWo INitial CApitals' "
+    WoerterLoeschen.click
+    printlog "+ UNcheck the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' "
+    WoerterAutomatisch.UnCheck
+    Kontext
+    printlog "select tabpage 'Options' "
+    Messagebox.SetPage TabOptionen
+    Kontext "TabOptionen"
+    Call DialogTest ( TabOptionen )
+    Kontext
+    printlog "select tabpage 'Custom Quotes' "
+    Messagebox.SetPage TabLocalizedOptions
+    Kontext "TabLocalizedOptions"  ' 1a
+    printlog "in the part of 'single quotes': "
+    printlog "+ check 'replace' "
+    printlog "+ click 'start quote' "
+    SingleQuotesReplace.Check
+    SingleQuotesStart.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 1 )
+    printlog "+  cancel dialog 'start quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 1b
+    printlog "+ click 'end quote' "
+    SingleQuotesEnd.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 2 )
+    printlog "+  cancel dialog 'end quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 1s
+    printlog "+ click button 'default' "
+    SingleQuotesDefault.Click
+
+    Kontext "TabLocalizedOptions"  ' 2a
+    printlog " in the part of 'double quotes': "
+    printlog "+ click 'start quote' "
+    DoubleQuotesStart.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 3 )
+    printlog "+  cancel dialog 'start quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 2b
+    printlog "+ click 'end quote' "
+    DoubleQuotesEnd.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 4 )
+    printlog "+  cancel dialog 'end quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 2s
+    printlog "+ click button 'default' "
+    DoubleQuotesDefault.Click
+    printlog "+ UNcheck 'replace' "
+    SingleQuotesReplace.UnCheck
+    printlog " cancel dialog 'AtorCorrect' "
+    TabLocalizedOptions.cancel
+    printlog " close application "
     Call hCloseDocument
-endcase
+
+endcase 'tiToolsAutoCorrect
 '-------------------------------------------------------------------------------
+
 testcase tChineseTranslation
 
     qaerrorlog( "#i89634# - Chinese Translation dialog does not close" )
@@ -335,139 +344,143 @@ testcase tChineseTranslation
         sFileName = "graphics\required\input\tchinese.odg"
     end if
 
-    '/// Open application ///'
+    printlog "Open application "
     Call hNewDocument
-    WaitSlot (2000)    'sleep 1
-    '/// Save old state and Activate Support for Asian language ///'
+    WaitSlot (2000) 
+    printlog "Save old state and Activate Support for Asian language "
     bSavedAsianSupport = ActiveDeactivateAsianSupport(TRUE)
-    '/// Open Document ///'
+    printlog "Open Document "
     Call hFileOpen ( ConvertPath(gTesttoolPath + sFileName) )
-    '/// If write-protected - open as Temp-file ///'
+    printlog "If write-protected - open as Temp-file "
     sleep (2)
     Kontext "Standardbar"
-        if Bearbeiten.GetState(2) <> 1 then
-            Bearbeiten.Click '0 = not pressed. 1 = pressed.
-            Kontext
-            if Active.Exists(1) then
-                Active.Yes
-            else
-                warnlog "No messagebox after making document editable? - Test canceled here"
-                goto endsub
-            end if
+    if Bearbeiten.GetState(2) <> 1 then
+        Bearbeiten.Click '0 = not pressed. 1 = pressed.
+        Kontext
+        if Active.Exists(1) then
+            Active.Yes
+        else
+            warnlog "No messagebox after making document editable? - Test canceled here"
+            goto endsub
         end if
+    end if
     if uCase(gApplication) = "IMPRESS" then
         Kontext "DocumentImpress"
     else
         Kontext "DocumentDraw"
     end if
-    '/// Select all, Press RETURN to enter text in Editmode ///'
-    '/// Move marker to top of the text, go two steps right, mark two characters ///'
+    printlog "Select all, Press RETURN to enter text in Editmode "
+    printlog "Move marker to top of the text, go two steps right, mark two characters "
     EditSelectAll
     hTypeKeys "<RETURN>"
     hTypeKeys "<MOD1 HOME><RIGHT><RIGHT><SHIFT RIGHT RIGHT>"
-    '/// Open Chinesetranslation ///'
+    printlog "Open Chinesetranslation "
     ToolsChineseTranslation
     WaitSlot (2000)    'sleep 1
     kontext "ChineseTranslation"
-        '/// Check if everything is there ///'
-        Call DialogTest ( ChineseTranslation )
-        '/// Click on EditTerms ///'
-        EditTerms.Click
-        kontext "ChineseDictionary"
-            '/// Check if everything is there ///'
-            Call DialogTest ( ChineseDictionary )
-            '/// Close dialog 'ChineseDictionary' with 'OK' ///'
-            ChineseDictionary.Ok
+    printlog " Check if everything is there "
+    Call DialogTest ( ChineseTranslation )
+    printlog " Click on EditTerms "
+    EditTerms.Click
+    kontext "ChineseDictionary"
+    printlog " Check if everything is there "
+    Call DialogTest ( ChineseDictionary )
+    printlog " Close dialog 'ChineseDictionary' with 'OK' "
+    ChineseDictionary.Ok
     kontext "ChineseTranslation"
-        '/// Close dialog 'Chinese' with 'OK' ///'
-        ChineseTranslation.OK
+    printlog " Close dialog 'Chinese' with 'OK' "
+    ChineseTranslation.OK
     kontext
-        '/// if messagebox exist, say OK; ('Spellcheck completed' or 'Word not found') ///'
-        if Messagebox.exists (5) then
-            printlog "Messagebox: "+Messagebox.gettext+"'"
-            Messagebox.ok
-        end if
-    '/// Restore old state for Asian language ///'
+    printlog " if messagebox exist, say OK; ('Spellcheck completed' or 'Word not found') "
+    if Messagebox.exists (5) then
+        printlog "Messagebox: "+Messagebox.gettext+"'"
+        Messagebox.ok
+    end if
+    printlog " Restore old state for Asian language "
     ActiveDeactivateAsianSupport(bSavedAsianSupport)
-    '/// Close application ///'
+    printlog " Close application "
     Call hCloseDocument
-endcase
+
+endcase 'tChineseTranslation
 '-------------------------------------------------------------------------------
+
 testcase tiToolsMacro
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
     WaitSlot (2000)    'sleep 2
-    '/// Tools->Macro ///'
+    printlog "Tools->Macro "
     ToolsMacro
     Kontext "Makro"
-        Call DialogTest ( Makro )
-        '/// click button 'organizer...' ///'
-        Verwalten.Click
-
+    Call DialogTest ( Makro )
+    printlog "click button 'organizer...' "
+    Verwalten.Click
     Kontext
-        '/// switch to tabpage 'Modules' ///'
-        Messagebox.SetPage TabModule
-        Kontext "TabModule"
-            Call DialogTest ( TabModule )
-
+    printlog "switch to tabpage 'Modules' "
+    Messagebox.SetPage TabModule
+    Kontext "TabModule"
+    Call DialogTest ( TabModule )
     Kontext
-        '/// switch to tabpage 'Libraries' ///'
-        Messagebox.SetPage TabBibliotheken
-        Kontext "TabBibliotheken"
-            Call DialogTest ( TabBibliotheken )
-            '/// click lbutton 'append' ///'
-            Hinzufuegen.Click
-            Kontext "Messagebox"
-                if Messagebox.Exists (5) then
-                    if Messagebox.GetRT = 304 then
-                        Warnlog Messagebox.Gettext
-                        Messagebox.Ok
-                    end if
-                end if
-            Kontext "OeffnenDlg"
-                '/// cancel dialog 'append libraries' ///'
-                OeffnenDlg.Cancel
-        Kontext "TabBibliotheken"
-            '/// click button 'new' ///'
-            Neu.Click
-            kontext "NeueBibliothek"
-                sleep 1 'Bibliotheksname
-                '/// cancel dialog 'new library' ///'
-                NeueBibliothek.cancel
-        Kontext "TabBibliotheken"
-            '/// close dialog 'macro organizer' ///'
-            TabBibliotheken.Close
+    printlog "switch to tabpage 'Libraries' "
+    Messagebox.SetPage TabBibliotheken
+    Kontext "TabBibliotheken"
+    Call DialogTest ( TabBibliotheken )
+    printlog "click lbutton 'append' "
+    Hinzufuegen.Click
+    Kontext "Messagebox"
+    if Messagebox.Exists (5) then
+        if Messagebox.GetRT = 304 then
+            Warnlog Messagebox.Gettext
+            Messagebox.Ok
+        end if
+    end if
+    Kontext "OeffnenDlg"
+    printlog "cancel dialog 'append libraries' "
+    OeffnenDlg.Cancel
+    Kontext "TabBibliotheken"
+    printlog "click button 'new' "
+    Neu.Click
+    kontext "NeueBibliothek"
+    sleep 1 'Bibliotheksname
+    printlog "cancel dialog 'new library' "
+    NeueBibliothek.cancel
+    Kontext "TabBibliotheken"
+    printlog "close dialog 'macro organizer' "
+    TabBibliotheken.Close
 
     Kontext "Makro"
-        '/// close dialog 'macro' ///'
-        Makro.Cancel
-    '/// close application ///'
+    printlog "close dialog 'macro' "
+    Makro.Cancel
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsMacro
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsGallery
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// Tools->Gallery ///'
+    printlog "Tools->Gallery "
     ToolsGallery
     WaitSlot (2000)    'sleep 1
-    '/// Tools->Gallery ///'
+    printlog "Tools->Gallery "
     ToolsGallery
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase'tiToolsGallery
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsEyedropper
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// Tools->Eyedropper ///'
+    printlog "Tools->Eyedropper "
     ToolsEyedropper
     Kontext "Pipette"
         Call DialogTest (Pipette)
-        '/// close dialog 'Eyedropper' ///'
+        printlog "close dialog 'Eyedropper' "
         Pipette.Close
         sleep 1
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsEyedropper
 
diff --git a/testautomation/graphics/required/includes/global/id_007.inc b/testautomation/graphics/required/includes/global/id_007.inc
index 29791d4b716f..81c265bca515 100644
--- a/testautomation/graphics/required/includes/global/id_007.inc
+++ b/testautomation/graphics/required/includes/global/id_007.inc
@@ -34,7 +34,6 @@
 sub id_007
 
     printLog Chr(13) + "---------    id_007    ----------"
-    ' in imp available via context menu, in draw via modify menu
 
     call tdModifyFlipVertikal
     call tdModifyFlipHorizontal
@@ -56,487 +55,460 @@ sub id_007
     call tdModifyCombineSplit
 end sub
 '-------------------------------------------------------------------------------
-testcase tdModifyFlipVertikal
 
-    '/// open application ///'
+testcase tdModifyFlipVertikal
+    printlog "open application"
     Call hNewDocument            ' imp: contextmenue same SID!
     sleep 1
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     try
-        '/// imp: Kontextmenu: Flip->Vertically ///'
-        '///+ Modify->Flip->Vertically ///'
+        printlog "imp: Kontextmenu: Flip->Vertically"
         ContextFlipVerticalDraw
         Printlog "- Flip-vertical is working"
     catch
    	    Warnlog "- Flip-Vertical does not work"
     endcatch
     sleep 1
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyFlipVertikal
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyFlipHorizontal
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument            ' imp: contextmenue same SID!
     WaitSlot (1000)
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     try
-        '/// imp: Kontextmenu: Flip->Horizontally ///'
-        '///+ Modify->Flip->Horizontally ///'
+        printlog "imp: Kontextmenu: Flip->Horizontally"
         ContextFlipHorizontalDraw
         Printlog "- Flip-horizontal is working"
     catch
    	    Warnlog "- Flip-horizontal does not work"
     endcatch
     sleep 1
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyFlipHorizontal
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertIntoCurve
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
-    '/// Modify->Convert->To Curve ///'
-    '///+ Modify->Convert->To Curve ///'
+    printlog "Modify->Convert->To Curve"
     ContextConvertIntoCurve
     WaitSlot (2000)
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextConvertIntoCurve
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertIntoPolygon
     dim iWaitIndex as integer
-    '/// open application ///'
-    Call hNewDocument            ' imp: contextmenue same SID!
+
+    printlog "open application"
+    Call hNewDocument        
     InsertGraphicsFromFile
     Kontext "GrafikEinfuegenDlg"
-        '/// Check if the dialogue is there. If not - wait for maximum 10 seconds)
-        iWaitIndex = 0
-        do while NOT GrafikEinfuegenDlg.Exists AND iWaitIndex < 10
-            sleep(1)
-            iWaitIndex = iWaitIndex + 1
-        loop
-        if NOT GrafikEinfuegenDlg.Exists AND iWaitIndex = 10 then
-            warnlog "Dialogue Insert Graphics didnt work. Ending testcase."
-            Call hCloseDocument
-            goto endsub
-        end if
-        '/// insert graphic: "global\input\graf_inp\enter.bmp" ///'
-        Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
-        Oeffnen.Click
-        sleep 3
-        '/// Modify->Convert->To Polygon ///'
-        '/// Modify->Convert->To Polygon ///'
-        ContextConvertIntoPolygon
-        Kontext "InPolygonUmwandeln"
-            Call DialogTest (InPolygonUmwandeln)
-            '/// check checkbox: 'Fill holes' ///'
-            LoecherFuellen.Check
-            '/// click more in number field: 'Number of colors' ///'
-            Farbanzahl.More
-            '/// click more in number field: 'Point reductionn' ///'
-            Punktreduktion.More
-            '/// click more in number field: 'Tile size' ///'
-            Kachelgroesse.More
-            '/// click button 'Preview' ///'
-            Vorschau.Click
-            sleep 10
-            '/// cancel dialog 'Convert to Polygon' ///'
-            InPolygonUmwandeln.Cancel
-            sleep (2)
-    '/// close application ///'
+    printlog "Check if the dialogue is there. If not - wait for maximum 10 seconds)"
+    iWaitIndex = 0
+    do while NOT GrafikEinfuegenDlg.Exists AND iWaitIndex < 10
+    sleep(1)
+    iWaitIndex = iWaitIndex + 1
+    loop
+    if NOT GrafikEinfuegenDlg.Exists AND iWaitIndex = 10 then
+        warnlog "Dialogue Insert Graphics didnt work. Ending testcase."
+        Call hCloseDocument
+        goto endsub
+    end if
+    printlog "insert graphic: global\input\graf_inp\enter.bmp"
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
+    Oeffnen.Click
+    sleep 3
+    printlog "Modify->Convert->To Polygon"
+    ContextConvertIntoPolygon
+    Kontext "InPolygonUmwandeln"
+    Call DialogTest (InPolygonUmwandeln)
+    printlog "check checkbox: 'Fill holes'"
+    LoecherFuellen.Check
+    printlog "click more in number field: 'Number of colors'"
+    Farbanzahl.More
+    printlog "click more in number field: 'Point reductionn'"
+    Punktreduktion.More
+    printlog "click more in number field: 'Tile size'"
+    Kachelgroesse.More
+    printlog "click button 'Preview'"
+    Vorschau.Click
+    sleep 10
+    printlog "cancel dialog 'Convert to Polygon'"
+    InPolygonUmwandeln.Cancel
+    sleep (2)
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextConvertIntoPolygon
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertIntoContour
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
-    '/// Modify->Convert->To Contour ///'
-    '/// Modify->Convert->To Contour ///'
+    printlog "Modify->Convert->To Contour"
     ContextConvertIntoContour
     WaitSlot (1000)
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextConvertIntoContour
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertInto3D
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
-    '/// Modify->Convert->To 3D ///'
-    '/// Modify->Convert->To 3D ///'
+    printlog "Modify->Convert->To 3D"
     ContextConvertInto3D
     WaitSlot (1000)
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextConvertInto3D
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertIntoRotationObject
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     WaitSlot (1000)
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen (20,20,50,50)
      sleep 2
-     '/// Modify->Convert->To 3D Rotation Object ///'
-     '/// Modify->Convert->To 3D Rotation Object ///'
+     printlog "Modify->Convert->To 3D Rotation Object"
      ContextConvertInto3DRotationObject
      WaitSlot (1000)
-     '/// close application ///'
+     printlog "close application"
      Call hCloseDocument
-endcase
+endcase 'tdContextConvertIntoRotationObject
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertIntoBitmap
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     WaitSlot (3000)
     InsertGraphicsFromFile
     WaitSlot (3000)
     Kontext "GrafikEinfuegenDlg"
-        sleep 2
-        '/// insert graphic: "global\input\graf_inp\columbia.dxf" ///'
-        Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\columbia.dxf")
-        sleep 2
-        Oeffnen.Click
-        sleep 2
-        try
-            '/// Modify->Convert->To Bitmap ///'
-            ContextConvertIntoBitmap
-            Printlog "- Convert into bitmap is working"
-        catch
-            Warnlog "- Convert into bitmap does not work"
-        endcatch
-    '/// close application ///'
+    sleep 2
+    printlog "insert graphic: global\input\graf_inp\columbia.dxf"
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\columbia.dxf")
+    sleep 2
+    Oeffnen.Click
+    sleep 2
+    try
+        printlog "Modify->Convert->To Bitmap"
+        ContextConvertIntoBitmap
+        Printlog "- Convert into bitmap is working"
+    catch
+        Warnlog "- Convert into bitmap does not work"
+    endcatch
+printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextConvertIntoBitmap
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertIntoMetaFile
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     WaitSlot (3000)
     InsertGraphicsFromFile
     WaitSlot (1000)
     kontext "Messagebox"
-        if Messagebox.Exists (5) Then Messagebox.OK
-            sleep 1
-            Kontext "GrafikEinfuegenDlg"
-                '/// insert graphic: "global\input\graf_inp\desp.bmp" ///'
-                sleep 2
-                Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-                sleep 2
-                Preview.Click
-                sleep 3
-                Oeffnen.Click
-                sleep 5
-            try
-                '/// Modify->Convert->To Metafile ///'
-                '/// Modify->Convert->To Metafile ///'
-                ContextConvertIntoMetafile
-                Printlog "- convert into meta file does work"
-            catch
-                Warnlog "- convert into meta file does not work"
-            endcatch
-    '/// close application ///'
+    if Messagebox.Exists (5) Then Messagebox.OK
+        sleep 1
+        Kontext "GrafikEinfuegenDlg"
+        printlog "insert graphic: global\input\graf_inp\desp.bmp"
+        sleep 2
+        Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
+        sleep 2
+        Preview.Click
+        sleep 3
+        Oeffnen.Click
+        sleep 5
+        try
+            printlog "Modify->Convert->To Metafile"
+            printlog "Modify->Convert->To Metafile"
+            ContextConvertIntoMetafile
+            Printlog "- convert into meta file does work"
+        catch
+            Warnlog "- convert into meta file does not work"
+        endcatch
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextConvertIntoMetaFile
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyArrange
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     hTypeKeys("<escape>")
     Call hRechteckErstellen ( 30, 30, 50, 60 )
-    '/// Modify->Arrange->Bring to Front ///'
-    '///+ Modify->Arrange->Bring to Front ///'
+    printlog "Modify->Arrange->Bring to Front"
     FormatArrangeBringToFront
     WaitSlot (1000)
-    '/// Modify->Arrange->Bring Forward ///'
-    '///+ Modify->Arrange->Bring Forward ///'
+    printlog "Modify->Arrange->Bring Forward"
     ContextArrangeBringForward
     WaitSlot (1000)
-    '/// Modify->Arrange->Send Backward ///'
-    '///+ Modify->Arrange->Send Backward ///'
+    printlog "Modify->Arrange->Send Backward"
     ContextArrangeBringBackward
     WaitSlot (1000)
-    '/// Modify->Arrange->Send to Back ///'
-    '///+ Modify->Arrange->Send to Back ///'
+    printlog "Modify->Arrange->Send to Back"
     FormatArrangeSendToBack
     WaitSlot (1000)
-    '/// Edit->Select All ///'
+    printlog "Edit->Select All"
     EditSelectAll
-    '/// Modify->Arrange->Reverse ///'
-    '///+ Modify->Arrange->Reverse ///'
+    printlog "Modify->Arrange->Reverse"
     ContextArrangeReverse
     WaitSlot (1000)
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyArrange
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyArrangeObjects
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     WaitSlot (1000)
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     Call hRechteckErstellen ( 20, 20, 30, 50 )
     hTypeKeys("<escape>")
     Call hRechteckErstellen ( 30,30,50,50 )
-    '/// Modify->Arrange->In Front of Object ///'
-    '///+ Modify->Arrange->In Front of Object ///'
+    printlog "Modify->Arrange->In Front of Object"
     ContextArrangeInFrontOfObject
-    '/// click on the upper left rectangle ///'
+    printlog "click on the upper left rectangle"
     gMouseClick 11,11
-    '/// Modify->Arrange->Behind Object ///'
-    '///+ Modify->Arrange->Behind Object ///'
+    printlog "Modify->Arrange->Behind Object"
     ContextArrangeBehindObject
-    '/// click on the lower right rectangle ///'
+    printlog "click on the lower right rectangle"
     gMouseClick 45,45
     sleep 1
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyArrangeObjects
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyAlignment
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     WaitSlot (1000)
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 20, 20, 30, 50 )
-    '/// Modify->Alignment->Left ///'
-    '///+ Modify->Alignment->Left ///'
+    printlog "Modify->Alignment->Left"
     ContextAlignmentLeft
     WaitSlot (1000)
-    '/// Modify->Alignment->Centered ///'
-    '///+ Modify->Alignment->Centered ///'
+    printlog "Modify->Alignment->Centered"
     ContextAlignmentCentered
     WaitSlot (1000)
-    '/// Modify->Alignment->Right ///'
-    '///+ Modify->Alignment->Right ///'
+    printlog "Modify->Alignment->Right"
     ContextAlignmentRight
     WaitSlot (1000)
-    '/// Modify->Alignment->Top ///'
-    '///+ Modify->Alignment->Top ///'
+    printlog "Modify->Alignment->Top"
     ContextAlignmentTop
     WaitSlot (1000)
-    '/// Modify->Alignment->Center ///'
-    '///+ Modify->Alignment->Center ///'
+    printlog "Modify->Alignment->Center"
     ContextAlignmentBottom
     WaitSlot (1000)
-    '/// Modify->Alignment->Bottom ///'
-    '///+ Modify->Alignment->Bottom ///'
+    printlog "Modify->Alignment->Bottom"
     ContextAlignmentCenter
     WaitSlot (1000)
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyAlignment
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextDistribution
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     WaitSlot (3000)
-    '/// create 3 rectangles ///'
+    printlog "create 3 rectangles"
     Call sSelectEmptyLayout
     Call hRechteckErstellen (20,20,30,30)
     Call hRechteckErstellen (40,40,50,50)
     Call hRechteckErstellen (60,60,70,70)
     sleep 1
-    '/// select all with keyboard: <STRG>+ <A> ///'
+    printlog "select all with keyboard: <STRG>+ <A>"
     EditSelectAll
     sleep 1
-    '/// Modify->Distibution... ///'
-    '///+ Modify->Distibution... ///'
+    printlog "Modify->Distibution..."
     ContextDistribution
     Kontext "VerteilenDlg"
-        sleep 1
-        Call DialogTest (VerteilenDlg)
-        sleep 1
-        '/// check radiobutton horizontal 'Left' ///'
-        Links.Check
-        '///+ check radiobutton 'Center' ///'
-        MitteHorizontal.Check
-        '///+ check radiobutton 'spacing' ///'
-        AbstandHorizontal.Check
-        '///+ check radiobutton 'right' ///'
-        Rechts.Check
-        '///+ check radiobutton 'none' ///'
-        KeineHorizontal.Check
-        '/// check radiobutton vertical 'top' ///'
-        Oben.Check
-        '///+ check radiobutton 'center' ///'
-        MitteVertikal.Check
-        '///+ check radiobutton 'spacing' ///'
-        AbstandVertikal.Check
-        '///+ check radiobutton 'bottom' ///'
-        Unten.Check
-        '///+ check radiobutton 'none' ///'
-        KeineVertikal.Check
-        '/// cancel dialog 'Distribution' ///'
-        VerteilenDlg.Cancel
-        sleep 2
-    '/// close application ///'
+    sleep 1
+    Call DialogTest (VerteilenDlg)
+    sleep 1
+    printlog "check radiobutton horizontal 'Left'"
+    Links.Check
+    printlog "check radiobutton 'Center'"
+    MitteHorizontal.Check
+    printlog "check radiobutton 'spacing'"
+    AbstandHorizontal.Check
+    printlog "check radiobutton 'right'"
+    Rechts.Check
+    printlog "check radiobutton 'none'"
+    KeineHorizontal.Check
+    printlog "check radiobutton vertical 'top'"
+    Oben.Check
+    printlog "check radiobutton 'center'"
+    MitteVertikal.Check
+    printlog "check radiobutton 'spacing'"
+    AbstandVertikal.Check
+    printlog "check radiobutton 'bottom'"
+    Unten.Check
+    printlog "check radiobutton 'none'"
+    KeineVertikal.Check
+    printlog "cancel dialog 'Distribution'"
+    VerteilenDlg.Cancel
+    sleep 2
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextDistribution
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextDescriptionObject
-    '/// Open application ///'
+    printlog "Open application"
     Call hNewDocument
     WaitSlot (1000)
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     ContextDescriptionObject
     Kontext "DescriptionObject"
-        Call DialogTest (DescriptionObject)
-        '/// Cancel dialog 'DescriptionObject' ///'
-        DescriptionObject.Cancel
-    '/// Close application ///'
+    Call DialogTest (DescriptionObject)
+    printlog "Cancel dialog 'DescriptionObject'"
+    DescriptionObject.Cancel
+    printlog "Close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextDescriptionObject
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextNameObject
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     WaitSlot (1000)
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     Call hRechteckErstellen ( 20, 20, 30, 50 )
     hTypeKeys("<escape>")
     Call hRechteckErstellen ( 30, 40, 50, 60 )
     sleep 1
-    '/// select both by spanning a selection with the mouse ///'
+    printlog "select both by spanning a selection with the mouse"
     gMouseMove 1,1,70,70
     sleep 1
-    '/// Modify->Group ///'
-    '///+ Modify->Group ///'
+    printlog "Modify->Group"
     FormatGroupGroup
     WaitSlot (1000)
-    '/// Modify->Name Object ///'
-    '///+ Modify->Name Object ///'
+    printlog "Modify->Name Object"
     ContextNameObject
     Kontext "NameDlgObject"
-        Call DialogTest (NameDlgObject)
-        '/// cancel dialog 'name' ///'
-        NameDlgObject.Cancel
-        '/// Modify->UnGroup ///'
-        '///+ Modify->UnGroup ///'
-        FormatUngroupDraw
-    '/// close application ///'
+    Call DialogTest (NameDlgObject)
+    printlog "cancel dialog 'name'"
+    NameDlgObject.Cancel
+    printlog "Modify->UnGroup"
+    FormatUngroupDraw
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdContextNameObject
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyConnectBreak
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     Call sSelectEmptyLayout
     sleep 1
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     Call hRechteckErstellen (10,10,30,30)
     Call hRechteckErstellen (35,35,50,50)
     sleep 1
-    '/// Edit->Select All ///'
+    printlog "Edit->Select All"
     EditSelectAll
-    '/// Modify->Connect ///'
-    '///+ Modify->Connect ///'
+    printlog "Modify->Connect"
     ContextConnect
     sleep 1
     try
-        '/// Modify->Break ///'
-        '///+ Modify->Break ///'
+        printlog "Modify->Break"
         ContextBreak
     catch
-  	    Warnlog "- Modify-Break does not work"
+        Warnlog "- Modify-Break does not work"
     endcatch
     sleep 1
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyConnectBreak
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyShapes
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     Call sSelectEmptyLayout
     sleep 1
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     gMouseClick 50,50
     Call hRechteckErstellen (30,30,50,50)
     Call hRechteckErstellen (60,60,80,80)
     sleep 1
-    '/// Edit->Select All ///'
+    printlog "Edit->Select All"
     EditSelectAll
     sleep 1
     try
-        '/// Modify->Shapes->Merge ///'
-        '///+ Modify->Shapes->Merge ///'
-   	    ModifyShapesMerge         ' 1
+        printlog "Modify->Shapes->Merge"
+        ModifyShapesMerge         ' 1
         WaitSlot (1000)    'sleep 1
-   	    Printlog "- Modify-Shape merge is working"
+        Printlog "- Modify-Shape merge is working"
     catch
-   	    Warnlog "- Modify-shape merge is not working"
+        Warnlog "- Modify-shape merge is not working"
     endcatch
-    '/// select all and delete it ///'
+    printlog "select all and delete it"
     EditSelectAll
     sleep 1
     hTypeKeys "<DELETE>"
     sleep 1
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     Call hRechteckErstellen (30,30,50,50)
     Call hRechteckErstellen (60,60,80,80)
     sleep 1
-    '/// Edit->Select All ///'
+    printlog "Edit->Select All"
     EditSelectAll
     sleep 1
     try
-        '/// Modify->Shapes->Substract ///'
-        '///+ Modify->Shapes->Substract ///'
-   	    ModifyShapesSubstract     ' 2
-   	    Printlog "- Modify-shape-substract is working"
+        printlog "Modify->Shapes->Substract"
+        ModifyShapesSubstract     ' 2
+        Printlog "- Modify-shape-substract is working"
     catch
-   	    Warnlog "- Modify-shape substract is not working"
+        Warnlog "- Modify-shape substract is not working"
     endcatch
     sleep 1
-    '/// select all and delete it ///'
+    printlog "select all and delete it"
     EditSelectAll
     sleep 1
     hTypeKeys "<DELETE>"
     sleep 1
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     Call hRechteckErstellen (30,30,50,50)
     sleep 1
     Call hRechteckErstellen (60,60,80,80)
@@ -544,45 +516,42 @@ testcase tdModifyShapes
     EditSelectall
     sleep 1
     try
-        '/// Modify->Shapes->Intersect ///'
-        '///+ Modify->Shapes->Intersect ///'
-   	    ModifyShapesIntersect      ' 3
-   	    Printlog "- Modify-shape intersect is working"
+        printlog "Modify->Shapes->Intersect"
+        ModifyShapesIntersect      ' 3
+        Printlog "- Modify-shape intersect is working"
     catch
-   	    Warnlog "- Modify-Shape intersect is not working"
+        Warnlog "- Modify-Shape intersect is not working"
     endcatch
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyShapes
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyCombineSplit
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     Call sSelectEmptyLayout
     sleep 1
-    '/// create two rectangles ///'
+    printlog "create two rectangles"
     Call hRechteckErstellen (30,30,50,50)
     Call hRechteckErstellen (60,60,80,80)
     sleep 1
-    '/// Edit->Select All ///'
+    printlog "Edit->Select All"
     EditSelectAll
     sleep 1
     try
-        '/// Modify->Shapes->Combine ///'
-        '///+ Modify->Shapes->Combine ///'
-   	    ContextCombine
-   	    Printlog "- Modify combine is working"
-        '/// Modify->Shapes->Split ///'
-        '///+ Modify->Shapes->Split ///'
-   	    ContextSplit
-   	    Printlog "- Modify-split is working"
+        printlog "Modify->Shapes->Combine"
+        ContextCombine
+        Printlog "- Modify combine is working"
+        printlog "Modify->Shapes->Split"
+        ContextSplit
+        Printlog "- Modify-split is working"
     catch
-   	    Warnlog "- Modify-combine and split are not working"
+        Warnlog "- Modify-combine and split are not working"
     endcatch
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyCombineSplit
 
-'------------------------------------------------------------------------------------------------------------------------------------------------
+'------------------------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/global/id_008.inc b/testautomation/graphics/required/includes/global/id_008.inc
index 8848c7337dac..f88174929c1f 100644
--- a/testautomation/graphics/required/includes/global/id_008.inc
+++ b/testautomation/graphics/required/includes/global/id_008.inc
@@ -41,43 +41,44 @@ end sub
 '-------------------------------------------------------------------------------
 testcase tiWindowNewWindow
 
-    '/// open application ///'
+    printlog "open application"
     Call  hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
-    '/// Window->New Window ///'
+    printlog "Window->New Window"
     WindowNewWindow
     WaitSlot (2000)
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tiWindowNewWindow
+
+'-------------------------------------------------------------------------------
 
 testcase tidWindow123
     goto endsub '' testing TBO: 29.03.2002
     dim iMenues as integer
-    '/// open application ///'
+    printlog "open application"
     Call  hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
 
     Kontext "DocumentImpress"
-        DocumentImpress.UseMenu
-        iMenues = MenuGetItemCount
-        warnlog "---- Number of Main menus: " & iMenues
-        MenuSelect(Menugetitemid(8))
-        sleep 1
-        iMenues = MenuGetItemCount
-        printlog "---- Number of Main menus: " & iMenues
-        '     MenuSelect(Menugetitemid(14))
-        sleep 1
-        i=1
-        printlog "count: " + i + "; of submenu: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
-        i=2
-        printlog "count: " + i + "; of submenu: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
-        warnlog "Dynamic entries not accessible ? :-((((("
-        '   i=3
-        '   printlog "count: " + i + "; of submenue: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
-    '/// close application ///'
+    DocumentImpress.UseMenu
+    iMenues = MenuGetItemCount
+    warnlog "---- Number of Main menus: " & iMenues
+    MenuSelect(Menugetitemid(8))
+    sleep 1
+    iMenues = MenuGetItemCount
+    printlog "---- Number of Main menus: " & iMenues
+    '     MenuSelect(Menugetitemid(14))
+    sleep 1
+    i=1
+    printlog "count: " + i + "; of submenu: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
+    i=2
+    printlog "count: " + i + "; of submenu: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
+    warnlog "Dynamic entries not accessible ? :-((((("
+    '   i=3
+    '   printlog "count: " + i + "; of submenue: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
+    printlog "close application"
     Call hCloseDocument
-endcase
-
+endcase 'tidWindow123
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/global/id_009.inc b/testautomation/graphics/required/includes/global/id_009.inc
index d03d99b6050c..3680dfafbc4f 100644
--- a/testautomation/graphics/required/includes/global/id_009.inc
+++ b/testautomation/graphics/required/includes/global/id_009.inc
@@ -43,252 +43,238 @@ sub id_009
 
 end sub
 '------------------------------------------------------------------------------
-testcase tmHelpHelpAgent
 
+testcase tmHelpHelpAgent
     Call hNewDocument
-
     hTBOtypeInDoc
-
     HelpHelpAgent         ' it's just a switch
     sleep 2
     HelpHelpAgent
-
     Call hCloseDocument
-endcase
+endcase 'tmHelpHelpAgent
 
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
+'------------------------------------------------------------------------------
 
 testcase tmHelpTips
    Call hNewDocument
    hTBOtypeInDoc
-
    HelpTips
    Sleep 2
    HelpTips
-
    Call hCloseDocument
-endcase
+endcase 'tmHelpTips
 
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
+'------------------------------------------------------------------------------
 
 testcase tmHelpExtendedTips
    Call hNewDocument
    hTBOtypeInDoc
-
    HelpEntendedHelp
    Sleep (2)
    HelpEntendedHelp
-
    Call hCloseDocument
-endcase
+endcase 'tmHelpExtendedTips
 
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
+'------------------------------------------------------------------------------
 
 testcase tmHelpAboutStarOffice
    Call hNewDocument
    hTBOtypeInDoc
-
    HelpAboutStarOffice
    Kontext "UeberStarMath"
    DialogTest (UeberStarMath)
    UeberStarMath.OK
-
    Call hCloseDocument
-endcase
+endcase 'tmHelpAboutStarOffice
 
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
+'------------------------------------------------------------------------------
 
 testcase tmHelpContents
-    goto endsub '"#i84486# - tmHelpContents outcommented due to crash."
-   dim i as integer
+    dim i as integer
 
-   '/// open application ///'
-   Call hNewDocument
-   '/// Help->Contents ///'
-   HelpContents
-   sleep(8)
-   kontext "StarOfficeHelp"
-   if Not StarOfficeHelp.Exists then
-      Warnlog "Help is not up!"
-   else
-      '/// get the number of entries in the listbox 'select Help modul' ///'
-      Printlog "HelpAbout: '" + HelpAbout.GetItemCount +"'"
-      '################ left half ################
-      '/// on the left half of the dialog: ///'
-      '///+ change to the tabpage 'Contents' ///'
-      TabControl.SetPage ContentPage
-         '///+ get the number of entries in the listbox 'MAin help themes' ///'
-         Printlog "SearchContent: '" + SearchContent.GetItemCount + "'"
-         '///+ change to the tabpage 'Index' ///'
-         TabControl.SetPage IndexPage
-         '///+ get the number of entries in the listbox 'Search term' ///'
-         Printlog "SearchIndex: '" + SearchIndex.GetItemCount + "'"
-         sleep 5
-         '///+ click on button 'Display' ///'
-         DisplayIndex.Click
-         sleep 5
-         '///+ change to the tabpage 'Find' ///'
-         TabControl.SetPage FindPage
-            '///+ get the number of entries in the listbox 'Search term' ///'
-            Printlog "SearchFind: '" + SearchFind.GetItemCount + "'"
-	    '/// If the Search-Text-Field is empty - Check that the Find-button is deactivated ///'
-	    if SearchFind.GetSelText = "" then
-	       if FindButton.IsEnabled then 
-	          warnlog "   The Find-Button should have been inactive, but was active."
-	       endif
-	    else
-	       warnlog "   The Search-Text-Field shouldn't contain any text. But contained: " + SearchFind.GetSelText
-	    endif
-            '/// Insert some irrelevant text to get 0 results from the search. ///'
-	    SearchFind.SetText "Doobbidedooo"
-	    '///+ click on button 'Find' ///'
-            FindButton.Click
-            kontext
-            '///+ Messagebox comes up about: 'No topics found.' say OK ///'
-            if (active.exists (2) )then
-               Printlog "active came up: '" + active.gettext + "'"
-               active.ok
+    printlog "open application"
+    Call hNewDocument
+    printlog "Help->Contents"
+    HelpContents
+    sleep(8)
+    kontext "StarOfficeHelp"
+    if Not StarOfficeHelp.Exists then
+        Warnlog "Help is not up!"
+    else
+        printlog "get the number of entries in the listbox 'select Help modul'"
+        Printlog "HelpAbout: '" + HelpAbout.GetItemCount +"'"
+        printlog "on the left half of the dialog:"
+        printlog "change to the tabpage 'Contents'"
+        TabControl.SetPage ContentPage
+        printlog "get the number of entries in the listbox 'MAin help themes'"
+        Printlog "SearchContent: '" + SearchContent.GetItemCount + "'"
+        printlog "change to the tabpage 'Index'"
+        TabControl.SetPage IndexPage
+        printlog "get the number of entries in the listbox 'Search term'"
+        Printlog "SearchIndex: '" + SearchIndex.GetItemCount + "'"
+        sleep 5
+        printlog "click on button 'Display'"
+        DisplayIndex.Click
+        sleep 5
+        printlog "change to the tabpage 'Find'"
+        TabControl.SetPage FindPage
+        printlog "get the number of entries in the listbox 'Search term'"
+        Printlog "SearchFind: '" + SearchFind.GetItemCount + "'"
+        printlog "If the Search-Text-Field is empty - Check that the Find-button is deactivated"
+        if SearchFind.GetSelText = "" then
+            if FindButton.IsEnabled then
+                warnlog "   The Find-Button should have been inactive, but was active."
             endif
-            kontext "StarOfficeHelp"
-            '///+ check checkbox 'Complete words only'  ///'
-            FindFullWords.Check
-            '///+ check checkbox 'Find in headings only'  ///'
-            FindInHeadingsOnly.Check
-            '///+ get the number of entries in the listbox 'List of headings' ///'
-            Printlog "Result: '" + Result.GetItemCount + "'"
-            '///+ click on button 'Display' ///'
-            DisplayFind.Click
-         '///+ change to the tabpage 'Bookmarks' ///'
-         TabControl.SetPage BookmarksPage
-            '///+ get the number of entries in the listbox 'Bookmark list' ///'
-            Printlog "Bookmarks: '" + Bookmarks.GetItemCount + "'"
-            '///+ click on button 'Display' ///'
-            DisplayBookmarks.Click
-         '################ right half ################
-         '/// on the right half of teh dialog: ///'
-         '################ toolbar ################
-         Kontext "TB_Help"
-            '///+ click on button 'Hide/Show Navigation Pane' ///'
-            Index.Click
+        else
+            warnlog "   The Search-Text-Field shouldn't contain any text. But contained: " + SearchFind.GetSelText
+        endif
+        printlog "Insert some irrelevant text to get 0 results from the search."
+        SearchFind.SetText "Doobbidedooo"
+        printlog "click on button 'Find'"
+        FindButton.Click
+        kontext
+        printlog "Messagebox comes up about: 'No topics found.' say OK"
+        if (active.exists (2) )then
+            Printlog "active came up: '" + active.gettext + "'"
+            active.ok
+        endif
+        kontext "StarOfficeHelp"
+        printlog "check checkbox 'Complete words only' "
+        FindFullWords.Check
+        printlog "check checkbox 'Find in headings only' "
+        FindInHeadingsOnly.Check
+        printlog "get the number of entries in the listbox 'List of headings'"
+        Printlog "Result: '" + Result.GetItemCount + "'"
+        printlog "click on button 'Display'"
+        DisplayFind.Click
+        printlog "change to the tabpage 'Bookmarks'"
+        TabControl.SetPage BookmarksPage
+        printlog "get the number of entries in the listbox 'Bookmark list'"
+        Printlog "Bookmarks: '" + Bookmarks.GetItemCount + "'"
+        printlog "click on button 'Display'"
+        DisplayBookmarks.Click
+        printlog "on the right half of teh dialog:"
+        Kontext "TB_Help"
+        printlog "click on button 'Hide/Show Navigation Pane'"
+        Index.Click
+        sleep 1
+        printlog "click on button 'Hide/Show Navigation Pane'"
+        Index.Click
+        sleep 1
+        printlog "click on button 'First Page'"
+        GoToStart.Click
+        sleep 1
+        printlog "click on button 'Previous Page'"
+        Backward.Click
+        sleep 1
+        printlog "click on button 'Next Page'"
+        Forward.Click
+        sleep 1
+        printlog "click on button 'Print ...'"
+        PrintButton.Click
+        sleep (1)
+        kontext "Active"
+        if Active.Exists( 2 ) then
+            qaerrorlog "No default printer defined: " & Active.GetText
+            Active.Ok
+        end if
+        kontext "Printing"
+        if Printing.Exists( 2 ) then
+            printlog "In the dialog 'Print' press the button 'Cancel'"
+            Printing.cancel
+        else
+            warnlog "the Print-Dialogue didnt appear."
+        end if
+        Kontext "TB_Help"
+        printlog "click on button 'Add to Bookmarks ...'"
+        sleep 1
+        SetBookmarks.Click
+        sleep 1
+        Kontext "AddBookmark"
+        printlog "on the dialog 'Add to Bookmarks ...' get the text from the editfield 'Bookmark' and press button 'Cancel'"
+        Printlog "Bookmarkname: '" + Bookmarkname.GetText + "'"
+        AddBookmark.Cancel
+        sleep 1
+        '################ help display ################
+        kontext "HelpContent"
+        printlog "open the Context Menu of the Frame 'Help Content' and count the entries"
+        HelpContent.OpenContextMenu
+        sleep 1
+        Printlog " i: " + hMenuItemGetCount
+        hMenuClose()
+        '################ right scroolbar ################
+        kontext "HelpContent"
+        printlog "click on button 'Previous Page'"
+        if HelpContentUP.IsVisible then
+            HelpContentUP.Click
             sleep 1
-            '///+ click on button 'Hide/Show Navigation Pane' ///'
-            Index.Click
-			sleep 1
-            '///+ click on button 'First Page' ///'
-            GoToStart.Click
-			sleep 1
-            '///+ click on button 'Previous Page' ///'
-            Backward.Click
-			sleep 1
-            '///+ click on button 'Next Page' ///'
-            Forward.Click
-			sleep 1
-            '///+ click on button 'Print ...' ///'
-            PrintButton.Click
-			sleep (1)
-			
-			   kontext "Active"
-			   if Active.Exists( 2 ) then
-			   	  qaerrorlog "No default printer defined: " & Active.GetText
-			   	  Active.Ok
-			   end if
-			   
-               kontext "Printing"
-               if Printing.Exists( 2 ) then
-                  '/// In the dialog 'Print' press the button 'Cancel' ///'
-                  Printing.cancel
-               else
-                  warnlog "the Print-Dialogue didnt appear."
-               end if
-            Kontext "TB_Help"
-            '///+ click on button 'Add to Bookmarks ...' ///'
-			sleep 1
-            SetBookmarks.Click
-			   sleep 1
-               Kontext "AddBookmark"
-               '///+ on the dialog 'Add to Bookmarks ...' get the text from the editfield 'Bookmark' and press button 'Cancel' ///'
-               Printlog "Bookmarkname: '" + Bookmarkname.GetText + "'"
-               AddBookmark.Cancel
-			   sleep 1
-         '################ help display ################
-         kontext "HelpContent"
-            '///+ open the Context Menu of the Frame 'Help Content' and count the entries ///'
-            HelpContent.OpenContextMenu
-
-			sleep 1
-			Printlog " i: " + hMenuItemGetCount
-            hMenuClose()
-         '################ right scroolbar ################
-         kontext "HelpContent"
-            '///+ click on button 'Previous Page' ///'
-            if HelpContentUP.IsVisible then
-               HelpContentUP.Click
-               sleep 1
-            endif
-            '///+ click on button 'Navigation' ///'
-            if HelpContentNAVIGATION.IsVisible then
-               HelpContentNAVIGATION.Click
-			   sleep 1
-            endif
-               kontext "NavigationsFenster"
-               '/// on the toolbox 'Navigation' press the window close button 'X' ///'
-               NavigationsFenster.Close
-			   sleep 1
-            kontext "HelpContent"
-            '///+ click on button 'Next Page' ///'
-            if HelpContentDOWN.IsVisible then
-               HelpContentDOWN.Click
-			   sleep 1
-            endif
-         kontext "StarOfficeHelp"
-      '/// close the help with the keys [strg]+[F4] ///'
-      Printlog "trying to close the help now"
-      try
-         StarOfficeHelp.TypeKeys "<Mod1 F4>" ' strg F4   supported since bug  #103586#
-      catch
-         Warnlog "failed to close the help window :-("
-      endcatch
-      kontext "StarOfficeHelp"
-      if StarOfficeHelp.Exists then
-         warnlog "Help still up!"
-      endif
-   endif
-   '/// close application ///'
-   Call hCloseDocument
-endcase
+        endif
+        printlog "click on button 'Navigation'"
+        if HelpContentNAVIGATION.IsVisible then
+            HelpContentNAVIGATION.Click
+            sleep 1
+        endif
+        kontext "NavigationsFenster"
+        printlog "on the toolbox 'Navigation' press the window close button 'X'"
+        NavigationsFenster.Close
+        sleep 1
+        kontext "HelpContent"
+        printlog "click on button 'Next Page'"
+        if HelpContentDOWN.IsVisible then
+            HelpContentDOWN.Click
+            sleep 1
+        endif
+        kontext "StarOfficeHelp"
+        printlog "close the help with the keys [strg]+[F4]"
+        Printlog "trying to close the help now"
+        try
+            StarOfficeHelp.TypeKeys "<Mod1 F4>" ' strg F4   supported since bug  #103586#
+        catch
+            Warnlog "failed to close the help window :-("
+        endcatch
+        kontext "StarOfficeHelp"
+        if StarOfficeHelp.Exists then
+            warnlog "Help still up!"
+        endif
+    endif
+    printlog "close application"
+    Call hCloseDocument
+endcase 'tmHelpContents
 
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
+'------------------------------------------------------------------------------
 
 testcase tCheckIfTheHelpExists
-   '/// open application ///'
-   Call hNewDocument
-   '/// Bring up the help-window ///'
-   HelpContents
-   kontext "HelpContent"
-      sleep (5)
-      '/// Press "CTRL A" and "CTRL C" to select all and then copy it. ///'
-      HelpContent.TypeKeys "<MOD1 A>"
-      sleep (1)
-      HelpContent.TypeKeys "<MOD1 C>"
-      '/// If the clipboard now is empty, then nothing were copied, which means we have a bug. ///'
-      if GetClipBoard = "" then
-         Warnlog "   No content in the Help-Content -view."
-      else
-         Printlog "   The Help-Content -view contained content. Good."
-      endif
-      kontext "StarOfficeHelp"
-      '/// Press "CTRL F4" to close the help-window. ///'
-      try
-         StarOfficeHelp.TypeKeys "<MOD1 F4>"
-      catch
-         Warnlog "   Failed to close the help window :-("
-      endcatch
-      kontext "StarOfficeHelp"
-      if StarOfficeHelp.Exists then
-         warnlog "Help was still visible!"
-      endif
-      '/// And a dot into the main window. Making sure kontext and focus is right. ///'
-      hTypeKeys "."
-   '/// Close Application ///'
-   Call hCloseDocument
+    printlog "open application"
+    Call hNewDocument
+    printlog "Bring up the help-window"
+    HelpContents
+    kontext "HelpContent"
+    sleep (5)
+    printlog "Press CTRL A and CTRL C to select all and then copy it."
+    HelpContent.TypeKeys "<MOD1 A>"
+    sleep (1)
+    HelpContent.TypeKeys "<MOD1 C>"
+    printlog "If the clipboard now is empty, then nothing were copied, which means we have a bug."
+    if GetClipBoard = "" then
+        Warnlog "No content in the Help-Content -view."
+    else
+        Printlog "The Help-Content -view contained content. Good."
+    endif
+    kontext "StarOfficeHelp"
+    printlog "Press CTRL F4 to close the help-window."
+    try
+        StarOfficeHelp.TypeKeys "<MOD1 F4>"
+    catch
+        Warnlog "   Failed to close the help window :-("
+    endcatch
+    kontext "StarOfficeHelp"
+    if StarOfficeHelp.Exists then
+        warnlog "Help was still visible!"
+    endif
+    printlog "And a dot into the main window. Making sure kontext and focus is right."
+    hTypeKeys "."
+    printlog "Close Application"
+    Call hCloseDocument
 endcase 'tCheckIfTheHelpExists
+
+'------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/global/id_011.inc b/testautomation/graphics/required/includes/global/id_011.inc
index 186c5e1b51ef..f9ad3f46378b 100644
--- a/testautomation/graphics/required/includes/global/id_011.inc
+++ b/testautomation/graphics/required/includes/global/id_011.inc
@@ -42,279 +42,271 @@ sub id_011
 
 end sub
 '-------------------------------------------------------------------------------
-testcase tiTextToolbar
 
+testcase tiTextToolbar
     Dim iWaitIndex as integer
     Dim Zufall as integer
     Dim i as integer
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
     Call sSelectEmptyLayout
-
-    '/// create a textframe with text ///'
+    printlog "create a textframe with text"
     hTextrahmenErstellen ("This is a Text, which will be formatted in several ways", 20,20,40,80)
-    '/// The 'Object Toolbar' now changes ///'
+    printlog "The 'Object Toolbar' now changes"
     sleep 2
-    '/// select of the text with <STRG> + <A> ///'
+    printlog "select of the text with <STRG> + <A>"
     EditSelectAll
     sleep 2
-    '/// Call the textobjectbar from the View-Toolbars-menu ///'
+    printlog "Call the textobjectbar from the View-Toolbars-menu"
     Kontext "TextObjectbar"
-        if TextObjectbar.Exists <> TRUE then  'isVisible
-            ViewToolbarsTextFormatting
-        end if
-        WaitSlot (3000)    'sleep (3)
+    if TextObjectbar.Exists <> TRUE then  'isVisible
+        ViewToolbarsTextFormatting
+    end if
+    WaitSlot (3000)    'sleep (3)
     Kontext "TextObjectbar"
-        Printlog "- choose random font"
-        randomize
-        Zufall=((2*Rnd)+1)      ' wird nicht auf den verfuegbaren bereich getreckt :-( TODO TBO!
-        Schriftart.GetItemcount
-        Schriftart.GetSelText
-        Schriftart.Select (Zufall)
-        '/// select any font you like in the listbox 'Font' on 'Object Toolbar' ///'
-        Printlog Schriftart.GetSelText + " chosen"
-
+    Printlog "- choose random font"
+    randomize
+    Zufall=((2*Rnd)+1)      ' wird nicht auf den verfuegbaren bereich getreckt :-( TODO TBO!
+    Schriftart.GetItemcount
+    Schriftart.GetSelText
+    Schriftart.Select (Zufall)
+    printlog "select any font you like in the listbox 'Font' on 'Object Toolbar'"
+    Printlog Schriftart.GetSelText + " chosen"
     Kontext "TextObjectbar"
-        sleep 2
-        Printlog "- Change size of font"
-        '/// select any font you like in the listbox 'Size' on 'Object Toolbar' ///'
-        Schriftgroesse.Select (Zufall)
-        Printlog Schriftgroesse.GetSelText + " chosen"
-
+    sleep 2
+    Printlog "- Change size of font"
+    printlog "select any font you like in the listbox 'Size' on 'Object Toolbar'"
+    Schriftgroesse.Select (Zufall)
+    Printlog Schriftgroesse.GetSelText + " chosen"
     Kontext "TextObjectbar"
-        Printlog "- Font attribute bold"
-        '/// click button 'Bold' ///'
-        Fett.Click
-        sleep 2
-
+    Printlog "- Font attribute bold"
+    printlog "click button 'Bold'"
+    Fett.Click
+    sleep 2
     Kontext "TextObjectbar"
-        Printlog "- Font attribute cursive"
-        '/// click button 'Italic' ///'
-        Kursiv.Click
-        sleep 2
-
+    Printlog "- Font attribute cursive"
+    printlog "click button 'Italic'"
+    Kursiv.Click
+    sleep 2
     Kontext "TextObjectbar"
-        Printlog "- Font attribute cursiv"
-        '/// click button 'Underline' ///'
-        Unterstrichen.Click
-        sleep 2
-
+    Printlog "- Font attribute cursiv"
+    printlog "click button 'Underline'"
+    Unterstrichen.Click
+    sleep 2
     Kontext "TextObjectbar"
-        Printlog "- font attribute color"
-        '/// click button 'Font Color' and tearoff the box ///'
-        sleep 3
-        FontColorGraphics.TearOff
-        Kontext "TB_Farbe"
-            TB_Farbe.Move 20, 20
-            Sleep 2
-            '/// double click in the middle of the box ///'
-            TB_Farbe.MouseDoubleClick 50, 50
-            Sleep 2
-            '/// close box 'Font Color' ///'
-            TB_Farbe.Close
+    Printlog "- font attribute color"
+    printlog "click button 'Font Color' and tearoff the box"
+    sleep 3
+    FontColorGraphics.TearOff
+    Kontext "TB_Farbe"
+    TB_Farbe.Move 20, 20
+    Sleep 2
+    printlog "double click in the middle of the box"
+    TB_Farbe.MouseDoubleClick 50, 50
+    Sleep 2
+    printlog "close box 'Font Color'"
+    TB_Farbe.Close
 
     Kontext "TextObjectbar"
-        Printlog "- Allign text left"
-        '/// click button 'Left' ///'
-        Linksbuendig.Click
-        sleep 2
+    Printlog "- Allign text left"
+    printlog "click button 'Left'"
+    Linksbuendig.Click
+    sleep 2
 
     Kontext "TextObjectbar"
-        Printlog "- Allign text centered"
-        '/// click button 'Centered' ///'
-        Zentriert.Click
-        sleep 2
+    Printlog "- Allign text centered"
+    printlog "click button 'Centered'"
+    Zentriert.Click
+    sleep 2
 
     Kontext "TextObjectbar"
-        Printlog "- align text to right"
-        '/// click button 'Right' ///'
-        Rechtsbuendig.Click
-        sleep 2
+    Printlog "- align text to right"
+    printlog "click button 'Right'"
+    Rechtsbuendig.Click
+    sleep 2
 
     Kontext "TextObjectbar"
-        Printlog "- Justified"
-        '/// click button 'Justified' ///'
-        Blocksatz.Click
-        sleep 2
+    Printlog "- Justified"
+    printlog "click button 'Justified'"
+    Blocksatz.Click
+    sleep 2
 
     Kontext "TextObjectbar"
-        if TextObjectbar.isEnabled <> TRUE then
-            warnlog "Couldn't access TextObjectbar - known bug with bars - FHA"
-            ViewToolbarsTextFormatting
-        end if
-        WaitSlot (2000)    'sleep 2
-        Printlog "- Raising Font spacing"
-        '/// click button 'Increase Spacing' ///'
-
+    if TextObjectbar.isEnabled <> TRUE then
+        warnlog "Couldn't access TextObjectbar - known bug with bars - FHA"
+        ViewToolbarsTextFormatting
+    end if
+    WaitSlot (2000)    'sleep 2
+    Printlog "- Raising Font spacing"
+    printlog "click button 'Increase Spacing'"
     kontext "TextObjectbar"
-        sleep 1
-        '/// Check if the bar is there. If not - wait for maximum 10 seconds)
-        iWaitIndex = 0
-        do while NOT TextObjectbar.isEnabled AND iWaitIndex < 10
-            sleep(1)
-            iWaitIndex = iWaitIndex + 1
-        loop
-        if NOT TextObjectbar.isEnabled AND iWaitIndex = 10 then
-            warnlog "Dialogue TextObjectbar didnt work. Ending testcase."
-            Call hCloseDocument
-            goto endsub
-        end if
-        '/// Activate the Font spacing-buttons ///'
-        TextObjectbar.OpenContextMenu
-            sleep 2
-            hMenuselectNr (1)
-            sleep 2
-            hMenuItemCheck (13)
-            sleep 2
-        TextObjectbar.OpenContextMenu
-            sleep 2
-            hMenuselectNr (1)
-            sleep 2
-            hMenuItemCheck (14)
-            sleep 2
-        ZeilenabstandErhoehen.Click
-            sleep 2
-
+    sleep 1
+    printlog "Check if the bar is there. If not - wait for maximum 10 seconds)"
+    iWaitIndex = 0
+    do while NOT TextObjectbar.isEnabled AND iWaitIndex < 10
+        sleep(1)
+        iWaitIndex = iWaitIndex + 1
+    loop
+    if NOT TextObjectbar.isEnabled AND iWaitIndex = 10 then
+        warnlog "Dialogue TextObjectbar didnt work. Ending testcase."
+        Call hCloseDocument
+        goto endsub
+    end if
+    printlog "Activate the Font spacing-buttons"
+    TextObjectbar.OpenContextMenu
+    sleep 2
+    hMenuselectNr (1)
+    sleep 2
+    hMenuItemCheck (13)
+    sleep 2
+    TextObjectbar.OpenContextMenu
+    sleep 2
+    hMenuselectNr (1)
+    sleep 2
+    hMenuItemCheck (14)
+    sleep 2
+    ZeilenabstandErhoehen.Click
+    sleep 2
     Kontext "TextObjectbar"
-        Printlog "- Decrease Spacing"
-        '/// click button 'Decrease Spacing' ///'
-        ZeilenabstandVerringern.Click
-        sleep 2
+    Printlog "- Decrease Spacing"
+    printlog "click button 'Decrease Spacing'"
+    ZeilenabstandVerringern.Click
+    sleep 2
 
     Kontext "TextObjectbar"
-        Printlog "- Numbering and Bullets"
-        sleep 2
-        '/// click button 'Bullets On/Off' ///'
-        BulletsOnOff.Click
-        sleep 2
-        '/// click button 'Bullets On/Off' ///'
-        BulletsOnOff.Click
-        '-----------------------------------------------------------------------
+    Printlog "- Numbering and Bullets"
+    sleep 2
+    printlog "click button 'Bullets On/Off'"
+    BulletsOnOff.Click
+    sleep 2
+    printlog "click button 'Bullets On/Off'"
+    BulletsOnOff.Click
+    '-----------------------------------------------------------------------
     Kontext "TextObjectBar"
-        Printlog "- Increase Font /Reduce Font"
-        sleep 2
-        printlog "- Click on Increase Font"
-        IncreaseFont.Click
-        sleep 2
-        printlog "- Click on Reduce Font"
-        ReduceFont.Click
-        '-----------------------------------------------------------------------
+    Printlog "- Increase Font /Reduce Font"
+    sleep 2
+    printlog "- Click on Increase Font"
+    IncreaseFont.Click
+    sleep 2
+    printlog "- Click on Reduce Font"
+    ReduceFont.Click
+    '-----------------------------------------------------------------------
     Kontext "TextObjectbar"
-        Printlog "- Text direction from left to right"
-        sleep 2
-        Printlog "- click button 'Text direction from left to right'"
-        try
-            TextdirectionLeftToRight.Click
-            printlog "hor does work :-)"
-            if (gAsianSup = FALSE) then
-                warnlog " this doesn't have to work if asian lang support is disabled :-)"
-            end if
-        catch
-            if (gAsianSup = TRUE) then
-                warnlog "hor does NOT work :-("
-            end if
-        endcatch
-        Printlog "- click button 'Text direction from top to bottom"
-        try
-            TextdirectionTopToBottom.Click
-            printlog "ver does work :-)"
-            if (gAsianSup = FALSE) then
-                warnlog " this doesnt have to work if asian lang support is disabled :-)"
-            end if
-        catch
-            if (gAsianSup = TRUE) then
-                warnlog "ver does NOT work :-( , AsianLanguage support is enabled !"
-            end if
-        endcatch
+    Printlog "- Text direction from left to right"
+    sleep 2
+    Printlog "- click button 'Text direction from left to right'"
+    try
+        TextdirectionLeftToRight.Click
+        printlog "hor does work :-)"
+        if (gAsianSup = FALSE) then
+            warnlog " this doesn't have to work if asian lang support is disabled :-)"
+        end if
+    catch
+        if (gAsianSup = TRUE) then
+            warnlog "hor does NOT work :-("
+        end if
+    endcatch
+    Printlog "- click button 'Text direction from top to bottom"
+    try
+        TextdirectionTopToBottom.Click
+        printlog "ver does work :-)"
+        if (gAsianSup = FALSE) then
+            warnlog " this doesnt have to work if asian lang support is disabled :-)"
+        end if
+    catch
+        if (gAsianSup = TRUE) then
+            warnlog "ver does NOT work :-( , AsianLanguage support is enabled !"
+        end if
+    endcatch
 
     Printlog "- open character dialog"
     Kontext "TextObjectbar"
-        sleep 2
-        '/// click button 'Character' ///'
-        Zeichenformat.Click
-        sleep 2
-        Kontext
-        Active.SetPage TabFont
-        Kontext "TabFont"
-            sleep 2
-            if TabFont.Exists Then
-                '/// close dialog 'character' ///'
-                TabFont.Cancel
-                Printlog "- Tabfont exists"
-            else
-                Warnlog "- No dialog exists "
-            end if
+    sleep 2
+    printlog "click button 'Character'"
+    Zeichenformat.Click
+    sleep 2
+    Kontext
+    Active.SetPage TabFont
+    Kontext "TabFont"
+    sleep 2
+    if TabFont.Exists Then
+        printlog "close dialog 'character'"
+        TabFont.Cancel
+        Printlog "- Tabfont exists"
+    else
+        Warnlog "- No dialog exists "
+    end if
 
     Kontext "TextObjectbar"
-        sleep 2
-        Printlog "- call properties for paragraph using text object toolbar"
-        '/// click button 'Paragraph' ///'
-        Absatzformat.Click
-        sleep 2
-        Kontext
-        Active.SetPage TabTabulator
-        Kontext "TabTabulator"
-            if TabTabulator.Exists Then
-                Printlog "- TabTabulator exists"
-                '/// close dialog 'Paragraph' ///'
-                TabTabulator.Cancel
-            else
-                Warnlog "- TabTabulator does not exist"
-            end if
+    sleep 2
+    Printlog "- call properties for paragraph using text object toolbar"
+    printlog "click button 'Paragraph'"
+    Absatzformat.Click
+    sleep 2
+    Kontext
+    Active.SetPage TabTabulator
+    Kontext "TabTabulator"
+    if TabTabulator.Exists Then
+        Printlog "- TabTabulator exists"
+        printlog "close dialog 'Paragraph'"
+        TabTabulator.Cancel
+    else
+        Warnlog "- TabTabulator does not exist"
+    end if
 
     if (UCase(gApplication)) = "IMPRESS" then  ' IMPRESS only
-        '/// if the Application is Impress: ///'
+        printlog "if the Application is Impress:"
 
         Kontext "TextObjectbar"
-            '/// click button 'Numbering Symbols' ///'
-            OutlineBullet.Click
-            kontext
-            if active.exists (5) then
-                messagebox.SetPage TabOptionenNumerierung
-                kontext "TabOptionenNumerierung"
-                    '/// cancel dialog 'Numbering/Bullets' ///'
-                    if (TabOptionenNumerierung.exists (5) ) then
-                        Printlog "Numbering/Bullets window came up :-)"
-                        sleep 2
-                        TabOptionenNumerierung.cancel
-                    else
-                        warnlog "no Numbering/Bullets window came up :-("
-                    end if
+        printlog "click button 'Numbering Symbols'"
+        OutlineBullet.Click
+        kontext
+        if active.exists (5) then
+            messagebox.SetPage TabOptionenNumerierung
+            kontext "TabOptionenNumerierung"
+                printlog "cancel dialog 'Numbering/Bullets'"
+                if (TabOptionenNumerierung.exists (5) ) then
+                    Printlog "Numbering/Bullets window came up :-)"
                     sleep 2
-            else
-                warnlog "no Numbering/Bullets window came up :-( 2"
-            end if
+                    TabOptionenNumerierung.cancel
+                else
+                    warnlog "no Numbering/Bullets window came up :-("
+                end if
+                sleep 2
+        else
+            warnlog "no Numbering/Bullets window came up :-( 2"
+        end if
 
-            Printlog "-change order of outline points"
-            sleep 3
-            '/// View->Master View->Outline View ///'
-            ViewWorkspaceOutlineView
-            WaitSlot (2000)    'sleep (3)
-            Kontext "DocumentImpressOutlineView"
-                sleep 1
-                '/// type something ///'
-                DocumentImpressOutlineView.TypeKeys "Bla bla bla <RETURN><TAB>bla bla bla bla bla <MOD1 SHIFT LEFT>"
-                sleep 1
-            Kontext "TextObjectbar"
-                '/// click button 'Promote' ///'
-                HierachieRunter.Click
-            sleep 1
-            Printlog "- Move back down"
-            '/// click button 'Denote' ///'
-            HierachieHoch.Click
-            sleep 1
-            '/// click button 'Denote' ///'
-            HierachieHoch.Click
-            sleep 1
-            Printlog "- Move paragraph up"
-            '/// click button 'Move Up', twice to get two slides ///'
-            AbsatzHoch.Click
-            sleep 1
-            Printlog "- move paragraph back down and switch to drawing view"
-            '/// click button 'Move Down' ///'
-            AbsatzRunter.Click
-            sleep 1
+        Printlog "-change order of outline points"
+        sleep 3
+        printlog "View->Master View->Outline View"
+        ViewWorkspaceOutlineView
+        WaitSlot (2000)    'sleep (3)
+        Kontext "DocumentImpressOutlineView"
+        sleep 1
+        printlog "type something"
+        DocumentImpressOutlineView.TypeKeys "Bla bla bla <RETURN><TAB>bla bla bla bla bla <MOD1 SHIFT LEFT>"
+        sleep 1
+        Kontext "TextObjectbar"
+        printlog "click button 'Promote'"
+        HierachieRunter.Click
+        sleep 1
+        Printlog "- Move back down"
+        printlog "click button 'Denote'"
+        HierachieHoch.Click
+        sleep 1
+        printlog "click button 'Denote'"
+        HierachieHoch.Click
+        sleep 1
+        Printlog "- Move paragraph up"
+        printlog "click button 'Move Up', twice to get two slides"
+        AbsatzHoch.Click
+        sleep 1
+        Printlog "- move paragraph back down and switch to drawing view"
+        printlog "click button 'Move Down'"
+        AbsatzRunter.Click
+        sleep 1
 
         Kontext "Vorschau"
         if Vorschau.Exists then
@@ -324,80 +316,79 @@ testcase tiTextToolbar
     
     else '      DRAW only
         Kontext "TextObjectbar"
-            Printlog "- Double"
-            '/// click button 'Double' ///'
-            LineSpacing2.Click
-            sleep 2
+        Printlog "- Double"
+        printlog "click button 'Double'"
+        LineSpacing2.Click
+        sleep 2
 
         Kontext "TextObjectbar"
-            Printlog "- 1.5 lines"
-            '/// click button '1.5 lines' ///'
-            LineSpacing15.Click
-            sleep 2
+        Printlog "- 1.5 lines"
+        printlog "click button '1.5 lines'"
+        LineSpacing15.Click
+        sleep 2
 
         Kontext "TextObjectbar"
-            Printlog "- Single"
-            '/// click button 'Single' ///'
-            LineSpacing1.Click
-            sleep 2
+        Printlog "- Single"
+        printlog "click button 'Single'"
+        LineSpacing1.Click
+        sleep 2
     end if
 
-    '/// Check if the bar is there. If not - wait for maximum 10 seconds)
+    printlog "Check if the bar is there. If not - wait for maximum 10 seconds)"
     iWaitIndex = 0
     Kontext "TextObjectbar"
-        do while TextObjectbar.isEnabled = FALSE AND iWaitIndex < 10
-            sleep(1)
-            iWaitIndex = iWaitIndex + 1
-        loop
-        if TextObjectbar.isEnabled = FALSE AND iWaitIndex = 10 then
-            warnlog "Dialogue TextObjectbar didnt work. Ending testcase."
-            Call hCloseDocument
-            goto endsub
-        end if
-        '/// Reset the original value of the Font spacing-buttons ///'
-        sleep 2
+    do while TextObjectbar.isEnabled = FALSE AND iWaitIndex < 10
+        sleep(1)
+        iWaitIndex = iWaitIndex + 1
+    loop
+    if TextObjectbar.isEnabled = FALSE AND iWaitIndex = 10 then
+        warnlog "Dialogue TextObjectbar didnt work. Ending testcase."
+        Call hCloseDocument
+        goto endsub
+    end if
+    printlog "Reset the original value of the Font spacing-buttons"
+    sleep 2
     Kontext "TextObjectbar"
-        TextObjectbar.OpenContextMenu
-            sleep 2
-            hMenuselectNr (1)
-            sleep 2
-            hMenuItemUnCheck (13)
-            sleep 2
-        TextObjectbar.OpenContextMenu
-            sleep 2
-            hMenuselectNr (1)
-            sleep 2
-            hMenuItemUnCheck (14)
-            sleep 2
-        '/// Close the TextFormatting Toolbar ///'
-        ViewToolbarsTextFormatting
-        WaitSlot (2000)    'sleep 1
-    '/// Clear the document from content ///'
+    TextObjectbar.OpenContextMenu
+    sleep 2
+    hMenuselectNr (1)
+    sleep 2
+    hMenuItemUnCheck (13)
+    sleep 2
+    TextObjectbar.OpenContextMenu
+    sleep 2
+    hMenuselectNr (1)
+    sleep 2
+    hMenuItemUnCheck (14)
+    sleep 2
+    printlog "Close the TextFormatting Toolbar"
+    ViewToolbarsTextFormatting
+    WaitSlot (2000)    'sleep 1
+    printlog "Clear the document from content"
     if (gApplication = "IMPRESS") then
         Kontext "DocumentImpressOutlineView"
-            DocumentImpressOutlineView.TypeKeys "<ESCAPE>"
-            EditSelectAll
-            DocumentImpressOutlineView.TypeKeys "<DELETE>"
-            sleep (3)
-            ViewWorkspaceDrawingView
+        DocumentImpressOutlineView.TypeKeys "<ESCAPE>"
+        EditSelectAll
+        DocumentImpressOutlineView.TypeKeys "<DELETE>"
+        sleep (3)
+        ViewWorkspaceDrawingView
         Kontext "DocumentImpress"
-            WaitSlot (2000)    'sleep 1
-            DocumentImpress.TypeKeys "<ESCAPE>"
-            EditSelectAll
-            DocumentImpress.TypeKeys "<DELETE>"
+        WaitSlot (2000)    'sleep 1
+        DocumentImpress.TypeKeys "<ESCAPE>"
+        EditSelectAll
+        DocumentImpress.TypeKeys "<DELETE>"
     else
         Kontext "DocumentDraw"
-            DocumentDraw.TypeKeys "<ESCAPE>"
-            EditSelectAll
-            DocumentDraw.TypeKeys "<DELETE>"
+        DocumentDraw.TypeKeys "<ESCAPE>"
+        EditSelectAll
+        DocumentDraw.TypeKeys "<DELETE>"
     end if
     Printlog "Test ended."
-
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tiTextToolbar
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
+'-------------------------------------------------------------------------------'
 
 testcase tiDrawObjectBar
     Dim a as string
@@ -405,764 +396,755 @@ testcase tiDrawObjectBar
     Dim i as integer
     Dim x as integer
 
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-
-    '/// create rectangle to test the part for draw objects ///'
+    printlog "create rectangle to test the part for draw objects"
     Call hRechteckErstellen (20,20,70,70)
     sleep 1
-    '--------------------------- format line ------------------------
     Printlog "- call format line using graphic object toolbar"
     Kontext "DrawingObjectbar"
-        '/// Check if the Graphic-Toolbar is there. Which it should be. ///'
-        '/// If it's not - then we call it from the View-Toolbars ///'
-        if DrawingObjectbar.Exists = FALSE then
-            ViewToolbarsGraphic
-        end if
-        if DrawingObjectbar.Exists = FALSE then
-            warnlog "Drawing-Objectbar should have been opened, but wasnt"
-            ViewToolbarsGraphic
-        end if
-
-        sleep 3
-        '/// click button 'line' on 'Object Toolbar' ///'
-        Linie.Click
-        sleep 2
-        Kontext
-        Active.SetPage TabLinie
-        Kontext "TabLinie"
-            if TabLinie.Exists Then
-                '/// cancel dialog 'line' ///'
-                TabLinie.Cancel
-                Printlog "- TabLinie exists "
-            else
-                Warnlog "- TabLinie does not exist"
-            end if
+    printlog "Check if the Graphic-Toolbar is there. Which it should be."
+    printlog "If it's not - then we call it from the View-Toolbars"
+    if DrawingObjectbar.Exists = FALSE then
+        ViewToolbarsGraphic
+    end if
+    if DrawingObjectbar.Exists = FALSE then
+        warnlog "Drawing-Objectbar should have been opened, but wasnt"
+        ViewToolbarsGraphic
+    end if
+    sleep 3
+    printlog "click button 'line' on 'Object Toolbar'"
+    Linie.Click
+    sleep 2
+    Kontext
+    Active.SetPage TabLinie
+    Kontext "TabLinie"
+    if TabLinie.Exists Then
+        printlog "cancel dialog 'line'"
+        TabLinie.Cancel
+        Printlog "- TabLinie exists "
+    else
+        Warnlog "- TabLinie does not exist"
+    end if
 
     '--------------------------- Linienendenstil --------------------
     Printlog "- Style of line ends"
     Kontext "DrawingObjectbar"
-        sleep 1
-        '/// click button 'Arrow Style' and tearoff the box ///'
-        Linienendenstil.TearOff
-        sleep 2
-        Kontext "Linienenden"
-            if Linienenden.Exists Then
-                Printlog "- dialog exists"
-                '/// close toolbox 'arrowheads' ///'
-                Linienenden.Close
-            else
-                Warnlog "- Arrowheads does not exist"
-            end if
+    sleep 1
+    printlog "click button 'Arrow Style' and tearoff the box"
+    Linienendenstil.TearOff
+    sleep 2
+    Kontext "Linienenden"
+    if Linienenden.Exists Then
+        Printlog "- dialog exists"
+        printlog "close toolbox 'arrowheads'"
+        Linienenden.Close
+    else
+        Warnlog "- Arrowheads does not exist"
+    end if
 
     '--------------------------- Linienstil -------------------------
     Printlog "- choose style of lines using graphic object toolbar"
 
     Kontext "DrawingObjectbar"
-        sleep 1
-        '/// select 2nd entry from the top in listbox 'Line Style' ///'
-        Linienstil.Select 2
-        Printlog Linienstil.GetSelText + " chosen"
-        '/// select last entry in listbox 'Line Style' ///'
-        Linienstil.Select Linienstil.GetItemCount
-        Printlog  Linienstil.GetSelText + " chosen"
-        sleep 2
+    sleep 1
+    printlog "select 2nd entry from the top in listbox 'Line Style'"
+    Linienstil.Select 2
+    Printlog Linienstil.GetSelText + " chosen"
+    printlog "select last entry in listbox 'Line Style'"
+    Linienstil.Select Linienstil.GetItemCount
+    Printlog  Linienstil.GetSelText + " chosen"
+    sleep 2
 
     '--------------------------- Linienbreite------------------------
     Printlog "- check style of lines using graphic object toolbar"
     Kontext "DrawingObjectbar"
-        sleep 1
-        a = Linienbreite.GetText
-        SetClipboard a
-        sleep 1
-        '/// set 'Line Width' to "0,5" ///'
-        Linienbreite.SetText "0,5"
-        sleep 2
-        '/// check if the value is accepted or not ///'
-        if Linienbreite.GetText = a Then
-            Warnlog "- changes in edit field did not happen; is: '"+Linienbreite.GetText+"', should be : '"+"0,5"+"'"
-        else
-            Printlog "- Width of lines changed"
-        end if
+    sleep 1
+    a = Linienbreite.GetText
+    SetClipboard a
+    sleep 1
+    printlog "set 'Line Width' to 0,5"
+    Linienbreite.SetText "0,5"
+    sleep 2
+    printlog "check if the value is accepted or not"
+    if Linienbreite.GetText = a Then
+        Warnlog "- changes in edit field did not happen; is: '"+Linienbreite.GetText+"', should be : '"+"0,5"+"'"
+    else
+        Printlog "- Width of lines changed"
+    end if
 
     '--------------------------- Linienfarbe ------------------------
     Printlog "- change line color"
     Kontext "DrawingObjectbar"
-        sleep 1
-        Zaehler = Linienfarbe.GetItemCount
-        randomize
-        i = Int(Zaehler*Rnd+1)
-        '/// select some entry in the listbox 'Line Color' ///'
-        Linienfarbe.Select i
-        Printlog Linienfarbe.GetSelText + " chosen"
+    sleep 1
+    Zaehler = Linienfarbe.GetItemCount
+    randomize
+    i = Int(Zaehler*Rnd+1)
+    printlog "select some entry in the listbox 'Line Color'"
+    Linienfarbe.Select i
+    Printlog Linienfarbe.GetSelText + " chosen"
 
     '--------------------------- Flaechenformatierung ---------------
     Printlog "- Call Format area using graphic object toolbar"
     Kontext "DrawingObjectbar"
-        sleep 1
-        '/// click button 'Area' ///'
-        try
-            Flaeche.Click
-        catch
-            printlog "clicking on area took ages :-("
-        endcatch
-        sleep 5
-        Kontext
-        Active.SetPage TabArea
-        Kontext "TabArea"
-            if TabArea.Exists Then
-                Printlog "- TabArea exists "
-                '/// cancel dialog 'Area' ///'
-                TabArea.Cancel
-            else
-                Warnlog "- TabArea does not exist"
-            end if
+    sleep 1
+    printlog "click button 'Area'"
+    try
+        Flaeche.Click
+    catch
+        printlog "clicking on area took ages :-("
+    endcatch
+    sleep 5
+    Kontext
+    Active.SetPage TabArea
+    Kontext "TabArea"
+    if TabArea.Exists Then
+        Printlog "- TabArea exists "
+        printlog "cancel dialog 'Area'"
+        TabArea.Cancel
+    else
+        Warnlog "- TabArea does not exist"
+    end if
 
     '---
     sleep 1
     Kontext "DrawingObjectbar"
+    sleep 1
+    x = AreaStyle.GetItemCount
+    i = 1
+    for i = i to x
+        AreaStyle.Select i
+        Printlog "Area Style: (" + i + "/" + x + ") - " + AreaStyle.GetSelText
         sleep 1
-        x = AreaStyle.GetItemCount
-        i = 1
-        for i = i to x
-            AreaStyle.Select i
-            Printlog "Area Style: (" + i + "/" + x + ") - " + AreaStyle.GetSelText
-            sleep 1
-            '/// for every item in the listbox 'Area Style' select the last item in the listbox 'Area Filling' ///'
-            if AreaStyle.GetSelIndex > 1 then
-                Printlog "     Area Filling " + AreaFilling.GetSelIndex + " - " + AreaFilling.GetItemCount
-                if (i <> 1) AND (AreaFilling.GetItemCount <> 0) then
-                    if (AreaFilling.GetSelIndex = 0) AND (AreaFilling.GetItemCount > 0) then
-                        printlog "default item is 0 => means nothing; NO BUG! 100909"
-                    end if
-                    AreaFilling.Select (AreaFilling.GetItemCount)
-                    Printlog "           Selected: " + AreaFilling.GetSelIndex + " - " + AreaFilling.GetSelText
+        printlog "for every item in the listbox 'Area Style' select the last item in the listbox 'Area Filling'"
+        if AreaStyle.GetSelIndex > 1 then
+            Printlog "     Area Filling " + AreaFilling.GetSelIndex + " - " + AreaFilling.GetItemCount
+            if (i <> 1) AND (AreaFilling.GetItemCount <> 0) then
+                if (AreaFilling.GetSelIndex = 0) AND (AreaFilling.GetItemCount > 0) then
+                    printlog "default item is 0 => means nothing; NO BUG! 100909"
                 end if
+                AreaFilling.Select (AreaFilling.GetItemCount)
+                Printlog "           Selected: " + AreaFilling.GetSelIndex + " - " + AreaFilling.GetSelText
             end if
-        next i
+        end if
+    next i
 
     '---------------------------- Schatten --------------------------
     Printlog "- Assign shadow using graphic object toolbar"
     Kontext "DrawingObjectbar"
-        sleep 1
-        '/// click button 'Shadow' ///'
-        Schatten.Click
-        sleep 1
-        Printlog "- shadow assigned"
+    sleep 1
+    printlog "click button 'Shadow'"
+    Schatten.Click
+    sleep 1
+    Printlog "- shadow assigned"
 
         '---------------------------- Praesentationsflyer ---------------
-        '/// if Application is Impress: ///'
-        if (UCase(gApplication)) = "IMPRESS" then  ' IMPRESS only
-            Printlog "- Call presentation flyer"
-            Kontext "CommonTaskbar" ' first check , if presentation flyer is up! if not -> make it up :-)
-            '///+ if 'Presentation Box' is not visible, click button 'Presentation Box on/off' ///'
-            if CommonTaskbar.Exists Then
-                printlog "- flyer is already visible :-)"
-            else
-                printlog "- flyer wasn't visible :-( -will be now!"
-                Kontext "DrawingObjectbar"
-                sleep 1
-                ViewToolbarsPresentation    ' put it up again!
-            end if
-        end if
-        '/// Make sure the Graphics-Toolbar is visible ///'
-        if ((UCase(gApplication)) = "IMPRESS") then    ' IMPRESS only
+    printlog "if Application is Impress:"
+    if (UCase(gApplication)) = "IMPRESS" then  ' IMPRESS only
+        Printlog "- Call presentation flyer"
+        Kontext "CommonTaskbar" ' first check , if presentation flyer is up! if not -> make it up :-)
+        printlog "if 'Presentation Box' is not visible, click button 'Presentation Box on/off'"
+        if CommonTaskbar.Exists Then
+            printlog "- flyer is already visible :-)"
+        else
+            printlog "- flyer wasn't visible :-( -will be now!"
             Kontext "DrawingObjectbar"
-                if DrawingObjectbar.isVisible = FALSE then
-                    ViewToolbarsGraphic
-                end if
+            sleep 1
+            ViewToolbarsPresentation    ' put it up again!
         end if
-    '/// close application ///'
+    end if
+    printlog "Make sure the Graphics-Toolbar is visible"
+    if ((UCase(gApplication)) = "IMPRESS") then    ' IMPRESS only
+        Kontext "DrawingObjectbar"
+        if DrawingObjectbar.isVisible = FALSE then
+            ViewToolbarsGraphic
+        end if
+    end if
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tiDrawObjectBar
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
+'------------------------------------------------------------------------------'
 
 testcase tiGraphicsObjectBar
     dim i as integer
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
 
-    '/// insert a graphic "global\input\graf_inp\desp.bmp" ///'
+    printlog "insert a graphic global\input\graf_inp\desp.bmp"
     hGrafikeinfuegen ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
+    sleep 1
+    Kontext "GraphicObjectbar"
+    if GraphicObjectbar.Exists = FALSE then
+    ViewToolbarsPicture
+    end if
+    sleep 1
+    printlog "click button 'Filter' and tearoff the box in the Objectbar"
+    Filter.TearOff
+    sleep 1
+    Kontext "GraphicFilterBar"
+    sleep 1
+    Printlog "invert"
+    printlog "click button 'Invert' in window 'Filters'"
+    Invert.Click
+    sleep 3
+    Printlog "smooth"
+    printlog "click button 'Smooth' in window 'Filters'"
+    Smooth.Click
+    sleep 3
+    Printlog "sharpen"
+    printlog "click button 'Sharpen' in window 'Filters'"
+    Sharpen.Click
+    sleep 3
+    Printlog "remove noise"
+    printlog "click button 'RemoveNoise' in window 'Filters'"
+    Remove.Click
+    sleep 3
+    Printlog "solarization"
+    printlog "click button 'Solarization' in window 'Filters'"
+    Solarization.Click
+    sleep 3
+    Kontext "Solarization"
+    if Solarization.exists (5) then
         sleep 1
-        Kontext "GraphicObjectbar"
-            if GraphicObjectbar.Exists = FALSE then
-                ViewToolbarsPicture
-            end if
-            sleep 1
-            '/// click button 'Filter' and tearoff the box in the Objectbar///'
-            Filter.TearOff
-            sleep 1
-            Kontext "GraphicFilterBar"
-                sleep 1
-                Printlog "invert"
-                '/// click button 'Invert' in window 'Filters' ///'
-                Invert.Click
-                sleep 3
-                Printlog "smooth"
-                '/// click button 'Smooth' in window 'Filters' ///'
-                Smooth.Click
-                sleep 3
-                Printlog "sharpen"
-                '/// click button 'Sharpen' in window 'Filters' ///'
-                Sharpen.Click
-                sleep 3
-                Printlog "remove noise"
-                '/// click button 'RemoveNoise' in window 'Filters' ///'
-                Remove.Click
-                sleep 3
-                Printlog "solarization"
-                '/// click button 'Solarization' in window 'Filters' ///'
-                Solarization.Click
-                sleep 3
-                Kontext "Solarization"
-                    if Solarization.exists (5) then
-                        sleep 1
-                        Call Dialogtest ( Solarization )
-                        sleep 1
-                        '///  press 'more' and 'less' in field 'Trashold Value' on dialog 'Solarization' ///'
-                        Value.More
-                        Value.Less
-                        '/// check checkbox 'Invert' on dialog 'Solarization' ///'
-                        Invert.Check
-                        '/// close dialog 'Solarization' with OK ///'
-                        Solarization.OK
-                    else
-                        warnlog "solarization didn't came up :-("
-                    end if
-                    sleep 1
-            Kontext "GraphicFilterBar"
-                sleep 1
-                Printlog "aging"
-                '/// click button 'Aging' in window 'Filters' ///'
-                Aging.Click
-                Kontext "Aging"
-                    sleep 1
-                    Call Dialogtest ( Aging )
-                    '///  press 'more' and 'less' in field 'Aging degree' on dialog 'Aging' ///'
-                    AgingDegree.More
-                    AgingDegree.Less
-                    sleep 1
-                    '/// close dialog 'Aging' with OK ///'
-                    Aging.OK
-                    sleep 1
-            Kontext "GraphicFilterBar"
-                sleep 1
-                Printlog "poster"
-                '/// click button 'Posterize' in window 'Filters' ///'
-                Posterize.Click
-                sleep 1
-                Kontext "Posterize"
-                    sleep 1
-                    Call Dialogtest ( Posterize )
-                    '///  press 'more' and 'less' in field 'Aging degree' on dialog 'Posterize' ///'
-                    PosterColors.More
-                    PosterColors.Less
-                    sleep 1
-                    '/// close dialog 'Posterize' with OK ///'
-                    Posterize.OK
-                    sleep 2
-            kontext "GraphicFilterBar"
-                sleep 1
-                Printlog "pop"
-                '/// click button 'PopArt' in window 'Filters' ///'
-                Art.Click
-                sleep 3
-                Printlog "charcoal"
-                '/// click button 'CharcoalSketch' in window 'Filters' ///'
-                CharcoalSketch.Click
-                sleep 3
-                Printlog "relief"
-                '/// click button 'Relief' in window 'Filters' ///'
-                Relief.Click
-                Kontext "Relief"
-                    sleep 1
-                    Call Dialogtest ( Relief )
-                    LightSource.TypeKeys "<left><up>"
-                    '/// close dialog 'Relief' with OK ///'
-                    Relief.OK
-                    sleep 3
-            Kontext "GraphicFilterBar"
-                Printlog "mos"
-                '/// click button 'Mosaic' in window 'Filters' ///'
-                Mosaic.Click
-                sleep 1
-                Kontext "Mosaic"
-                    sleep 1
-                    Call Dialogtest ( Mosaic )
-                    '///  press 'more' and 'less' in field 'Width' on dialog 'Mosaic' ///'
-                    Width.More
-                    Width.Less
-                    '///  press 'more' and 'less' in field 'Height' on dialog 'Mosaic' ///'
-                    Height.More
-                    Height.Less
-                    '///  check checkbox 'Enhance Edges' on dialog 'Mosaic' ///'
-                    EnhanceEdges.Check
-                    '/// close dialog 'Mosaic' with OK ///'
-                    Mosaic.OK
-                    sleep 3
-            Kontext "GraphicFilterBar"
-                    '/// close dialog 'Filters' ///'
-                    GraphicFilterBar.Close
-
-            Kontext "GraphicObjectbar"
-                if GraphicObjectbar.Exists = FALSE then ViewToolbarsPicture
-                    sleep 1
-                    '/// select every entry in the listbox 'Graphics mode' ///'
-                for i = 1 to Grafikmodus.GetItemCount
-                    Grafikmodus.select i
-                    sleep 1
-                next i
-
-                '///  Click on the icon for 'ColorSettings' to open the colorbar ///'
-                ColorSettings.Click
-                Kontext "ColorBar"
-                sleep (2)
-
-                '///  press 'more' and 'less' in field 'Red' on colorbar ///'
-                try
-                    Rotanteil.More
-                    Rotanteil.Less
-                catch
-                    warnlog "not working from testtool redvalue "+   rotanteil.GetRT
-                endcatch
-                '///  press 'more' and 'less' in field 'Green' on colorbar ///'
-                try
-                    Gruenanteil.More
-                    Gruenanteil.Less
-                catch
-                    warnlog "not working from testtool Greenvalue."
-                endcatch
-                '///  press 'more' and 'less' in field 'Blue' on colorbar ///'
-                try
-                    Blauanteil.More
-                    Blauanteil.Less
-                catch
-                    warnlog "not working from testtool Bluevalue."
-                endcatch
-                '///  press 'more' and 'less' in field 'Brightness' on colorbar ///'
-                try
-                    Helligkeit.More
-                    Helligkeit.Less
-                catch
-                    warnlog "not working from testtool Brightness."
-                endcatch
-                '///  press 'more' and 'less' in field 'Contrast' on colorbar ///'
-                try
-                    Kontrast.More
-                    Kontrast.Less
-                catch
-                    warnlog "not working from testtool Contrast."
-                endcatch
-                '///  press 'more' and 'less' in field 'Gamma' on colorbar ///'
-                try
-                    Gamma.More
-                    Gamma.Less
-                catch
-                    warnlog "not working from testtool Gamma."
-                endcatch
-
-                ColorBar.Close
-            Kontext "GraphicObjectbar"
-
-                '///  press 'more' and 'less' in field 'Transparency' on objectbar ///'
-                try
-                    Transparenz.More
-                    Transparenz.Less
-                catch
-                    warnlog "Not working from testtool Transparency."
-                endcatch
-
-                '/// press button 'Crop'  on objectbar ///'
-                Crop.click
-                '/// Opening Dialog via Slot
-                FormatCropPicture
-                
-            kontext "TabZuschneiden"
-                '///  check radiobutton 'Keep scale' on dialog 'Crop' ///'
-                GroesseBeibehalten.Check
-                '///  check radiobutton 'Keep Image Size' on dialog 'Crop' ///'
-                MassstabBeibehalten.Check
-                '///  press 'more' and 'less' in field 'Left' in section 'Crop' on dialog 'Crop' ///'
-                Links.More
-                Links.Less
-                '///  press 'more' and 'less' in field 'Right' in section 'Crop' on dialog 'Crop' ///'
-                Rechts.More
-                Rechts.Less
-                '///  press 'more' and 'less' in field 'Top' in section 'Crop' on dialog 'Crop' ///'
-                Oben.More
-                Oben.Less
-                '///  press 'more' and 'less' in field 'Bottom' in section 'Crop' on dialog 'Crop' ///'
-                Unten.More
-                Unten.Less
-                '///  press 'more' and 'less' in field 'Width' in section 'Scale' on dialog 'Crop' ///'
-                MassstabBreite.More
-                MassstabBreite.Less
-                '///  press 'more' and 'less' in field 'Height' in section 'Scale' on dialog 'Crop' ///'
-                MassstabHoehe.More
-                MassstabHoehe.Less
-                '///  press 'more' and 'less' in field 'Width' in section 'Image size' on dialog 'Crop' ///'
-                GroesseBreite.More
-                GroesseBreite.Less
-                '///  press 'more' and 'less' in field 'Height' in section 'Image size' on dialog 'Crop' ///'
-                GroesseHoehe.More
-                GroesseHoehe.Less
-                '///  click button 'Original Size' on dialog 'Crop' ///'
-                Originalgroesse.Click
-                '/// cancel dialog 'Crop' ///'
-                TabZuschneiden.Cancel
+        Call Dialogtest ( Solarization )
+        sleep 1
+        printlog " press 'more' and 'less' in field 'Trashold Value' on dialog 'Solarization'"
+        Value.More
+        Value.Less
+        printlog "check checkbox 'Invert' on dialog 'Solarization'"
+        Invert.Check
+        printlog "close dialog 'Solarization' with OK"
+        Solarization.OK
+    else
+        warnlog "solarization didn't came up :-("
+    end if
+    sleep 1
+    Kontext "GraphicFilterBar"
+    sleep 1
+    Printlog "aging"
+    printlog "click button 'Aging' in window 'Filters'"
+    Aging.Click
+    Kontext "Aging"
+    sleep 1
+    Call Dialogtest ( Aging )
+    printlog " press 'more' and 'less' in field 'Aging degree' on dialog 'Aging'"
+    AgingDegree.More
+    AgingDegree.Less
+    sleep 1
+    printlog "close dialog 'Aging' with OK"
+    Aging.OK
+    sleep 1
+    Kontext "GraphicFilterBar"
+    sleep 1
+    Printlog "poster"
+    printlog "click button 'Posterize' in window 'Filters'"
+    Posterize.Click
+    sleep 1
+    Kontext "Posterize"
+    sleep 1
+    Call Dialogtest ( Posterize )
+    printlog " press 'more' and 'less' in field 'Aging degree' on dialog 'Posterize'"
+    PosterColors.More
+    PosterColors.Less
+    sleep 1
+    printlog "close dialog 'Posterize' with OK"
+    Posterize.OK
+    sleep 2
+    kontext "GraphicFilterBar"
+    sleep 1
+    Printlog "pop"
+    printlog "click button 'PopArt' in window 'Filters'"
+    Art.Click
+    sleep 3
+    Printlog "charcoal"
+    printlog "click button 'CharcoalSketch' in window 'Filters'"
+    CharcoalSketch.Click
+    sleep 3
+    Printlog "relief"
+    printlog "click button 'Relief' in window 'Filters'"
+    Relief.Click
+    Kontext "Relief"
+    sleep 1
+    Call Dialogtest ( Relief )
+    LightSource.TypeKeys "<left><up>"
+    printlog "close dialog 'Relief' with OK"
+    Relief.OK
+    sleep 3
+    Kontext "GraphicFilterBar"
+    Printlog "mos"
+    printlog "click button 'Mosaic' in window 'Filters'"
+    Mosaic.Click
+    sleep 1
+    Kontext "Mosaic"
+    sleep 1
+    Call Dialogtest ( Mosaic )
+    printlog " press 'more' and 'less' in field 'Width' on dialog 'Mosaic'"
+    Width.More
+    Width.Less
+    printlog " press 'more' and 'less' in field 'Height' on dialog 'Mosaic'"
+    Height.More
+    Height.Less
+    printlog " check checkbox 'Enhance Edges' on dialog 'Mosaic'"
+    EnhanceEdges.Check
+    printlog "close dialog 'Mosaic' with OK"
+    Mosaic.OK
+    sleep 3
+    Kontext "GraphicFilterBar"
+    printlog "close dialog 'Filters'"
+    GraphicFilterBar.Close
+
+    Kontext "GraphicObjectbar"
+    if GraphicObjectbar.Exists = FALSE then ViewToolbarsPicture
+        sleep 1
+        printlog "select every entry in the listbox 'Graphics mode'"
+    for i = 1 to Grafikmodus.GetItemCount
+        Grafikmodus.select i
+        sleep 1
+    next i
 
-    '/// close application ///'
+    printlog " Click on the icon for 'ColorSettings' to open the colorbar"
+    ColorSettings.Click
+    Kontext "ColorBar"
+    sleep (2)
+    printlog " press 'more' and 'less' in field 'Red' on colorbar"
+    try
+        Rotanteil.More
+        Rotanteil.Less
+    catch
+        warnlog "not working from testtool redvalue "+   rotanteil.GetRT
+    endcatch
+    printlog " press 'more' and 'less' in field 'Green' on colorbar"
+    try
+        Gruenanteil.More
+        Gruenanteil.Less
+    catch
+        warnlog "not working from testtool Greenvalue."
+    endcatch
+    printlog " press 'more' and 'less' in field 'Blue' on colorbar"
+    try
+        Blauanteil.More
+        Blauanteil.Less
+    catch
+        warnlog "not working from testtool Bluevalue."
+    endcatch
+    printlog " press 'more' and 'less' in field 'Brightness' on colorbar"
+    try
+        Helligkeit.More
+        Helligkeit.Less
+    catch
+        warnlog "not working from testtool Brightness."
+    endcatch
+    printlog " press 'more' and 'less' in field 'Contrast' on colorbar"
+    try
+        Kontrast.More
+        Kontrast.Less
+    catch
+        warnlog "not working from testtool Contrast."
+    endcatch
+    printlog " press 'more' and 'less' in field 'Gamma' on colorbar"
+    try
+        Gamma.More
+        Gamma.Less
+    catch
+        warnlog "not working from testtool Gamma."
+    endcatch
+
+    ColorBar.Close
+    Kontext "GraphicObjectbar"
+
+    printlog " press 'more' and 'less' in field 'Transparency' on objectbar"
+    try
+        Transparenz.More
+        Transparenz.Less
+    catch
+        warnlog "Not working from testtool Transparency."
+    endcatch
+
+    printlog "press button 'Crop'  on objectbar"
+    Crop.click
+    printlog "Opening Dialog via Slot"
+    FormatCropPicture
+
+    kontext "TabZuschneiden"
+    printlog " check radiobutton 'Keep scale' on dialog 'Crop'"
+    GroesseBeibehalten.Check
+    printlog " check radiobutton 'Keep Image Size' on dialog 'Crop'"
+    MassstabBeibehalten.Check
+    printlog " press 'more' and 'less' in field 'Left' in section 'Crop' on dialog 'Crop'"
+    Links.More
+    Links.Less
+    printlog " press 'more' and 'less' in field 'Right' in section 'Crop' on dialog 'Crop'"
+    Rechts.More
+    Rechts.Less
+    printlog " press 'more' and 'less' in field 'Top' in section 'Crop' on dialog 'Crop'"
+    Oben.More
+    Oben.Less
+    printlog " press 'more' and 'less' in field 'Bottom' in section 'Crop' on dialog 'Crop'"
+    Unten.More
+    Unten.Less
+    printlog " press 'more' and 'less' in field 'Width' in section 'Scale' on dialog 'Crop'"
+    MassstabBreite.More
+    MassstabBreite.Less
+    printlog " press 'more' and 'less' in field 'Height' in section 'Scale' on dialog 'Crop'"
+    MassstabHoehe.More
+    MassstabHoehe.Less
+    printlog " press 'more' and 'less' in field 'Width' in section 'Image size' on dialog 'Crop'"
+    GroesseBreite.More
+    GroesseBreite.Less
+    printlog " press 'more' and 'less' in field 'Height' in section 'Image size' on dialog 'Crop'"
+    GroesseHoehe.More
+    GroesseHoehe.Less
+    printlog " click button 'Original Size' on dialog 'Crop'"
+    Originalgroesse.Click
+    printlog "cancel dialog 'Crop'"
+    TabZuschneiden.Cancel
+
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tiGraphicsObjectBar
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
+'-------------------------------------------------------------------------------'
 
 testcase tiGluepointToolbar
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
 
-    '/// create 2 rectangles ///'
+    printlog "create 2 rectangles"
     Call hRechteckErstellen 20,20,40,40
     Call hRechteckErstellen 60,60,80,80
     sleep 2
-    '/// View->Toolbars->Option Bar ///'
+    printlog "View->Toolbars->Option Bar"
     ViewToolbarsOptionbar
-    '/// at the bottom of the office has a toolbar to appear ///'
+    printlog "at the bottom of the office has a toolbar to appear"
     sleep 2
 
     Kontext "Optionsbar"
+    if Optionsbar.Exists = False Then
+        ViewToolbarsOptionbar
+        Kontext "Optionsbar"
         if Optionsbar.Exists = False Then
-            ViewToolbarsOptionbar
-            Kontext "Optionsbar"
-                if Optionsbar.Exists = False Then
-                    warnlog "Can't open Optionsbar."
-                end if
+            warnlog "Can't open Optionsbar."
         end if
+    end if
+    sleep 2
+    Kontext "Toolbar"
+    sleep 1
+    printlog "click button 'Connector' on Toolbar"
+    Verbinder.Click
+    printlog "make a line with the mouse"
+    gMouseMove 30,30,70,70
+    sleep 3
+    Kontext "Toolbar"
+    GluePoints.Click
+    sleep 1
+    printlog "open Glue Points Toolbar"
+    Kontext "Gluepointsobjectbar"
+    if Gluepointsobjectbar.Exists = False Then
+        ViewToolbarsGluepoints
+    end if
+    sleep 3
+    '-------------------------------------- Klebepunkt einfuegen ----
+    try
+        printlog "click button 'Insert Glue Point' on Objecttoolbar"
+        PunkteEinfuegen.Click
         sleep 2
-        Kontext "Toolbar"
-            sleep 1
-            '/// click button 'Connector' on Toolbar ///'
-            Verbinder.Click
-            '/// make a line with the mouse ///'
-            gMouseMove 30,30,70,70
-            sleep 3
-            Kontext "Toolbar"
-                GluePoints.Click
-                sleep 1
-                '/// open Glue Points Toolbar ///'
-                Kontext "Gluepointsobjectbar"
-                    if Gluepointsobjectbar.Exists = False Then
-                        ViewToolbarsGluepoints
-                    end if
-                    sleep 3
-                    '-------------------------------------- Klebepunkt einfuegen ----
-                    try
-                        '/// click button 'Insert Glue Point' on Objecttoolbar ///'
-                        PunkteEinfuegen.Click
-                        sleep 2
-                        '/// click 2 times onto the created line ///'
-                        gMouseClick 25,30
-                        sleep 1
-                        gMouseclick 25,30
-                        Printlog "- insert gluepoint works"
-                    catch
-                        Warnlog "- gluepoint could not be insert. Following errors might have their reason here"
-                    endcatch
-                    sleep 3
-                Kontext "Gluepointsobjectbar"
-
-                    '-------------------------------------- Links -------------------
-                    try
-                    '/// click button 'Exit Direction Left' on Objecttoolbar ///'
-                        Links.Click
-                        Printlog "- gluepoint left works"
-                    catch
-                        Warnlog "- gluepoint left does not work"
-                    endcatch
-                    sleep 1
-                    '-------------------------------------- Rechts ------------------
-                    try
-                        '/// click button 'Exit Direction Right' on Objecttoolbar ///'
-                        Rechts.Click
-                        Printlog "- gluepoint right works"
-                    catch
-                        Warnlog "- gluepoint right does not work"
-                    endcatch
-                    sleep 1
-                    '-------------------------------------- Oben --------------------
-                    try
-                        '/// click button 'Exit Direction Top' on Objecttoolbar ///'
-                        Oben.Click
-                        Printlog "- gluepoint top works"
-                    catch
-                        Warnlog "- gluepoint top does not work"
-                    endcatch
-                    sleep 1
-                    '-------------------------------------- Unten -------------------
-                    try
-                    '/// click button 'Exit Direction Bottom' on Objecttoolbar ///'
-                        Unten.Click
-                        Printlog "- gluepoint bottom works"
-                    catch
-                        Warnlog "- gluepoint bottom does not work"
-                    endcatch
-                    sleep 1
-                    '---------------------- Position an Objekt anpassen -------------
-                    try
-                        '/// click button 'Glue Point Relative' on Objecttoolbar ///'
-                        PositionAnObjektAnpassen.Click
-                        Printlog "- align position to object works"
-                        gMouseClick 25,30      ' if you don't click onto an existing point, the state changes back :-[
-                    catch
-                        Warnlog "- align position to object does not work"
-                    endcatch
-                Kontext "Gluepointsobjectbar"
-                    sleep 1
-                    '------------------------------------- Horizontal links ---------
-                    if PositionAnObjektAnpassen.exists then printlog "PositionAnObjektAnpassen = Exists"
-                    if PositionAnObjektAnpassen.GetState(2) <> 0 then PositionAnObjektAnpassen.Click ' make unpressed!
-                    '0 = not pressed. 1 = pressed.
-                    sleep 2
-                    try
-                        Kontext "Gluepointsobjectbar"
-                        '/// click button 'Glue Point Horizontal Left' on Objecttoolbar ///'
-                        HorizontalLinks.Click
-                        Printlog "- align horizontal left works"
-                    catch
-                        Warnlog "- align horizontal left does not work"
-                        PositionAnObjektAnpassen.Click ' that's the middle button, it has to be UP/not activated!
-                        for i = 1 to Gluepointsobjectbar.GetItemCount
-                            if (Gluepointsobjectbar.GetState ( i, 0 ) <> 0 ) then ' is no seperator
-                                printlog "----------------------------------------------------------------------"
-                                printlog "helpid  : " + Gluepointsobjectbar.Getstate ( i, 0 ) + "  number in row: " + i
-                                printlog "itemtype: " + Gluepointsobjectbar.GetState ( i, 1 )
-                                printlog "state   : " + Gluepointsobjectbar.GetState ( i, 2 )
-                                printlog "----------------------------------------------------------------------"
-                            end if
-                        next i
-                    endcatch
-                    sleep 2
-                    '------------------------------------- Horizontal rechts --------
-                    try
-                        '/// click button 'Glue Point Horizontal Right' on Objecttoolbar ///'
-                        HorizontalRechts.Click
-                        Printlog "- Align horizontal right does work"
-                    catch
-                        Warnlog "- Align horizontal right does notwork"
-                    endcatch
-                    sleep 1
-                    '------------------------------------- Horizontal zentriert -----
-                    try
-                        '/// click button 'Glue Point Horizontal Center' on Objecttoolbar ///'
-                        HorizontalZentriert.Click
-                        Printlog "- align horizontal center does work"
-                    catch
-                        Warnlog "- align horizontal center does work"
-                    endcatch
-                    sleep 1
-                    '------------------------------------- Vertikal oben ------------
-                    try
-                    '/// click button 'Glue Point Vertical Top' on Objecttoolbar ///'
-                        VertikalOben.Click
-                        sleep 1
-                        Printlog "- Align vertical top does work"
-                    catch
-                        Warnlog "- Align vertical top does not work"
-                    endcatch
-                    '------------------------------------- Vertikal unten -----------
-                    try
-                    '/// click button 'Glue Point Vertical Bottom' on Objecttoolbar ///'
-                        VertikalUnten.Click
-                        sleep 1
-                        printlog "- Align vertical bottom does work"
-                    catch
-                        Warnlog "- Align vertical bottom does not work"
-                    endcatch
-                    '------------------------------------- Vertikal zentriert -------
-                    try
-                        '/// click button 'Glue Point Vertical Center' on Objecttoolbar ///'
-                        VertikalZentriert.Click
-                        sleep 1
-                        Printlog "- Align vertical center does work"
-                    catch
-                        Warnlog "- Align vertical center does not work"
-                    endcatch
-
-                    Printlog "- End of testing gluepoints"
-
-    '/// Close the Option Bar via View->Toolbars->Option Bar ///'
+        printlog "click 2 times onto the created line"
+        gMouseClick 25,30
+        sleep 1
+        gMouseclick 25,30
+        Printlog "- insert gluepoint works"
+    catch
+        Warnlog "- gluepoint could not be insert. Following errors might have their reason here"
+    endcatch
+    sleep 3
+    Kontext "Gluepointsobjectbar"
+
+    '-------------------------------------- Links -------------------
+    try
+        printlog "click button 'Exit Direction Left' on Objecttoolbar"
+        Links.Click
+        Printlog "- gluepoint left works"
+    catch
+        Warnlog "- gluepoint left does not work"
+    endcatch
+    sleep 1
+    '-------------------------------------- Rechts ------------------
+    try
+        printlog "click button 'Exit Direction Right' on Objecttoolbar"
+        Rechts.Click
+        Printlog "- gluepoint right works"
+    catch
+        Warnlog "- gluepoint right does not work"
+    endcatch
+    sleep 1
+    '-------------------------------------- Oben --------------------
+    try
+        printlog "click button 'Exit Direction Top' on Objecttoolbar"
+        Oben.Click
+        Printlog "- gluepoint top works"
+    catch
+        Warnlog "- gluepoint top does not work"
+    endcatch
+    sleep 1
+    '-------------------------------------- Unten -------------------
+    try
+        printlog "click button 'Exit Direction Bottom' on Objecttoolbar"
+        Unten.Click
+        Printlog "- gluepoint bottom works"
+    catch
+        Warnlog "- gluepoint bottom does not work"
+    endcatch
+    sleep 1
+    '---------------------- Position an Objekt anpassen -------------
+    try
+        printlog "click button 'Glue Point Relative' on Objecttoolbar"
+        PositionAnObjektAnpassen.Click
+        Printlog "- align position to object works"
+        gMouseClick 25,30      ' if you don't click onto an existing point, the state changes back :-[
+    catch
+        Warnlog "- align position to object does not work"
+    endcatch
+    Kontext "Gluepointsobjectbar"
+    sleep 1
+    '------------------------------------- Horizontal links ---------
+    if PositionAnObjektAnpassen.exists then printlog "PositionAnObjektAnpassen = Exists"
+    if PositionAnObjektAnpassen.GetState(2) <> 0 then PositionAnObjektAnpassen.Click ' make unpressed!
+    '0 = not pressed. 1 = pressed.
+    sleep 2
+    try
+        Kontext "Gluepointsobjectbar"
+        printlog "click button 'Glue Point Horizontal Left' on Objecttoolbar"
+        HorizontalLinks.Click
+        Printlog "- align horizontal left works"
+    catch
+        Warnlog "- align horizontal left does not work"
+        PositionAnObjektAnpassen.Click ' that's the middle button, it has to be UP/not activated!
+        for i = 1 to Gluepointsobjectbar.GetItemCount
+            if (Gluepointsobjectbar.GetState ( i, 0 ) <> 0 ) then ' is no seperator
+                printlog "----------------------------------------------------------------------"
+                printlog "helpid  : " + Gluepointsobjectbar.Getstate ( i, 0 ) + "  number in row: " + i
+                printlog "itemtype: " + Gluepointsobjectbar.GetState ( i, 1 )
+                printlog "state   : " + Gluepointsobjectbar.GetState ( i, 2 )
+                printlog "----------------------------------------------------------------------"
+            end if
+        next i
+    endcatch
+    sleep 2
+    '------------------------------------- Horizontal rechts --------
+    try
+        printlog "click button 'Glue Point Horizontal Right' on Objecttoolbar"
+        HorizontalRechts.Click
+        Printlog "- Align horizontal right does work"
+    catch
+        Warnlog "- Align horizontal right does notwork"
+    endcatch
+    sleep 1
+    '------------------------------------- Horizontal zentriert -----
+    try
+        printlog "click button 'Glue Point Horizontal Center' on Objecttoolbar"
+        HorizontalZentriert.Click
+        Printlog "- align horizontal center does work"
+    catch
+        Warnlog "- align horizontal center does work"
+    endcatch
+    sleep 1
+    '------------------------------------- Vertikal oben ------------
+    try
+        printlog "click button 'Glue Point Vertical Top' on Objecttoolbar"
+        VertikalOben.Click
+        sleep 1
+        Printlog "- Align vertical top does work"
+    catch
+        Warnlog "- Align vertical top does not work"
+    endcatch
+    '------------------------------------- Vertikal unten -----------
+    try
+        printlog "click button 'Glue Point Vertical Bottom' on Objecttoolbar"
+        VertikalUnten.Click
+        sleep 1
+        printlog "- Align vertical bottom does work"
+    catch
+        Warnlog "- Align vertical bottom does not work"
+    endcatch
+    '------------------------------------- Vertikal zentriert -------
+    try
+        printlog "click button 'Glue Point Vertical Center' on Objecttoolbar"
+        VertikalZentriert.Click
+        sleep 1
+        Printlog "- Align vertical center does work"
+    catch
+        Warnlog "- Align vertical center does not work"
+    endcatch
+    Printlog "- End of testing gluepoints"
+    printlog "Close the Option Bar via View->Toolbars->Option Bar"
     ViewToolbarsOptionbar
     sleep 2
     Kontext "Optionsbar"
-        if Optionsbar.Exists = True Then
-            warnlog "Couldnt close Optionsbar."
-        end if
-    '/// close application ///'
+    if Optionsbar.Exists = True Then
+        warnlog "Couldnt close Optionsbar."
+    end if
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tiGluepointToolbar
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
+'----------------------------------------------------------------------------'
 
 testcase tdBezierToolbar
-    '/// Open the Application ///'
+    printlog "Open the Application"
     Call hNewDocument
-
-    '/// Create a rectangle. ///'
+    printlog "Create a rectangle."
     Call hRechteckErstellen ( 10, 10, 30, 40 )
     sleep (1)
-
-    '/// Convert the recttangle to an 'Polygon-object' via the context-menu for the object ///'
+    printlog "Convert the recttangle to an 'Polygon-object' via the context-menu for the object"
     Call hOpenContextMenu
-    Call hMenuSelectNr (11)   '/// Convert to ///'
-    Call hMenuSelectNr (2)   '/// Polygon-object ///'
+    printlog "Convert to"
+    Call hMenuSelectNr (11)
+    printlog "Polygon-object"
+    Call hMenuSelectNr (2)   
     sleep (1)
-
-    '/// In the context-menu, select 'Edit Points" ///'
+    printlog "In the context-menu, select 'Edit Points"
     Call hOpenContextMenu
-    Call hMenuSelectNr (5)  '/// Select entry nr 5 (Edit Points) ///'
+    printlog "Select entry nr 5 (Edit Points)"
+    Call hMenuSelectNr (5)  
     sleep (2)
-
     Kontext "Bezierobjectbar"
+    if Bezierobjectbar.Exists <> TRUE then
+        ViewToolbarsBezier
+        Sleep (2)
         if Bezierobjectbar.Exists <> TRUE then
-            ViewToolbarsBezier
-            Sleep (2)
-            if Bezierobjectbar.Exists <> TRUE then
-                warnlog "Bezierobjectbar did not show up. Check why."
-            end if
+            warnlog "Bezierobjectbar did not show up. Check why."
         end if
+    end if
 
     '----------------------------------- Punkte verschieben ------------------------------------
-    '/// Select a part of the object with the keyboard ///'
-    hTypeKeys "<MOD1 TAB>", 4   '/// Selects the fourth vector. ///'
-    hTypeKeys "<RIGHT>", 40  '/// Moves the selected vector 40 steps. ///'
+    printlog "Select a part of the object with the keyboard"
+    printlog "Selects the fourth vector."
+    hTypeKeys "<MOD1 TAB>", 4   
+    printlog "Moves the selected vector 40 steps."
+    hTypeKeys "<RIGHT>", 40
 
-    '/// The 'Object Toolbar' now changes ///'
+    printlog "The 'Object Toolbar' now changes"
     Kontext "Bezierobjectbar"
-        if Bezierobjectbar.Exists <> TRUE then
-            ViewToolbarsBezier
-            Sleep 2
-        end if
-        if Bezierobjectbar.Exists <> TRUE then
-            Warnlog "The Bezier-Objectbar should have been opened, but wasnt."
-            ViewToolbarsBezier
-            Sleep 2
-        end if
+    if Bezierobjectbar.Exists <> TRUE then
+        ViewToolbarsBezier
+        Sleep 2
+    end if
+    if Bezierobjectbar.Exists <> TRUE then
+        Warnlog "The Bezier-Objectbar should have been opened, but wasnt."
+        ViewToolbarsBezier
+        Sleep 2
+    end if
 
     Kontext "Bezierobjectbar"
-        sleep 1
-        Printlog "- Move points"
-        '/// click button 'Move points' on 'Object Toolbar' ///'
-        Verschieben.Click
-        sleep 2
-    
-        hTypeKeys "<MOD1 TAB>"
-        hTypeKeys "<MOD1 SHIFT SPACE>"  '/// Marks the selected vector. ///'
-        hTypeKeys "<RIGHT>", 20   '/// Moves the vector 20 with "arrow right", twenty times. ///'
-    
-        Printlog "- Insert points"
-        '/// Click button 'Insert points' on 'Object Toolbar' ///'
+    sleep 1
+    Printlog "- Move points"
+    printlog "click button 'Move points' on 'Object Toolbar'"
+    Verschieben.Click
+    sleep 2
+    hTypeKeys "<MOD1 TAB>"
+    printlog "Marks the selected vector."
+    hTypeKeys "<MOD1 SHIFT SPACE>"
+    printlog "Moves the vector 20 with arrow right, twenty times."
+    hTypeKeys "<RIGHT>", 20   
+
+    Printlog "- Insert points"
+    printlog "Click button 'Insert points' on 'Object Toolbar'"
     Kontext "Bezierobjectbar"
-        Einfuegen.Click
-        sleep 2
-        Bezierobjectbar.Move 20, 20
-        sleep (1)
-        Printlog "- Delete points"
-    
-        '/// Select another part of the object with spanning a selection with the mouse ///'
-        gMouseMove 25,25,45,45
-    
-        hTypeKeys "<MOD1 TAB>", 2   '/// Select the second next vector. ///'
-        hTypeKeys "<MOD1 SHIFT SPACE>"   '/// Mark the selected vector. ///'
-        hTypeKeys "<MOD1 TAB><SHIFT SPACE>"  '/// Select and mark the next vector. ///'
+    Einfuegen.Click
+    sleep 2
+    Bezierobjectbar.Move 20, 20
+    sleep (1)
+    Printlog "- Delete points"
+    printlog "Select another part of the object with spanning a selection with the mouse"
+    gMouseMove 25,25,45,45
+    printlog "Select the second next vector."
+    hTypeKeys "<MOD1 TAB>", 2
+    printlog "Mark the selected vector."
+    hTypeKeys "<MOD1 SHIFT SPACE>"
+    printlog "Select and mark the next vector."
+    hTypeKeys "<MOD1 TAB><SHIFT SPACE>"  
     
-        sleep 2
+    sleep 2
     Kontext "Bezierobjectbar"
-        sleep 2
-        Printlog "- Convert into curve"
-        '/// click button 'convert to curve' on 'Object Toolbar' ///'
-        InKurve.Click
-        sleep 2
-        Printlog "- Place edge point"
-        '/// click button 'corner point' on 'Object Toolbar' ///'
-        Ecke.Click
-        sleep 2
-        Printlog "- Smooth transition"
-        '/// click button 'smooth transition' on 'Object Toolbar' ///'
-        Glatt.Click
-        sleep 2
-        Printlog "- Symetric transition"
-        '/// click button 'symmetric transition' on 'Object Toolbar' ///'
-        Symmetrisch.Click
-        sleep 2
-    
-        '/// Click button 'Eliminate points' on 'Object Toolbar' ///'
+    sleep 2
+    Printlog "- Convert into curve"
+    printlog "click button 'convert to curve' on 'Object Toolbar'"
+    InKurve.Click
+    sleep 2
+    Printlog "- Place edge point"
+    printlog "click button 'corner point' on 'Object Toolbar'"
+    Ecke.Click
+    sleep 2
+    Printlog "- Smooth transition"
+    printlog "click button 'smooth transition' on 'Object Toolbar'"
+    Glatt.Click
+    sleep 2
+    Printlog "- Symetric transition"
+    printlog "click button 'symmetric transition' on 'Object Toolbar'"
+    Symmetrisch.Click
+    sleep 2
+
+    printlog "Click button 'Eliminate points' on 'Object Toolbar'"
     Kontext "Bezierobjectbar"
-        PunkteReduzieren.Click
-        sleep 2
-    
-        '/// Mark another point ///'
-        hTypeKeys "<MOD1 TAB>"
-        hTypeKeys "<MOD1 SHIFT SPACE>"
+    PunkteReduzieren.Click
+    sleep 2
     
-        '/// click button 'split curve' on 'Object Toolbar' ///'
+    printlog "Mark another point"
+    hTypeKeys "<MOD1 TAB>"
+    hTypeKeys "<MOD1 SHIFT SPACE>"
+
+    printlog "click button 'split curve' on 'Object Toolbar'"
     Kontext "Bezierobjectbar"
-        try
-            Auftrennen.Click
-        catch
-            Warnlog "- 'Break' could not be executed"
-        endcatch
-        sleep 2
+    try
+        Auftrennen.Click
+    catch
+        Warnlog "- 'Break' could not be executed"
+    endcatch
+    sleep 2
 
-        '/// Mark all points ///'
-        hTypeKeys "<MOD1 TAB>"
-        hTypeKeys "<MOD1 A>"
+    printlog "Mark all points"
+    hTypeKeys "<MOD1 TAB>"
+    hTypeKeys "<MOD1 A>"
 
-        Printlog "- Close bezier"
+    Printlog "- Close bezier"
     Kontext "Bezierobjectbar"
+    try
+        printlog "click button 'close bezier' on 'Object Toolbar'"
+        Schliessen.Click
+    catch
+        InKurve.Click
+        sleep 2
         try
-            '/// click button 'close bezier' on 'Object Toolbar' ///'
             Schliessen.Click
         catch
-            InKurve.Click
-            sleep 2
-            try
-                Schliessen.Click
-            catch
-                warnlog "Couldn't push button :-( can't reproduce it now, mostly seen on linux, if i loop this test, it happens only 1/5 of the time ... :-)"
-            endcatch
+            warnlog "Couldn't push button :-( can't reproduce it now, mostly seen on linux, if i loop this test, it happens only 1/5 of the time ... :-)"
         endcatch
-        sleep 2
+    endcatch
+    sleep 2
 
-        '/// Mark all points ///'
-        hTypeKeys "<MOD1 TAB>"
-        hTypeKeys "<MOD1 A>"
+    printlog "Mark all points"
+    hTypeKeys "<MOD1 TAB>"
+    hTypeKeys "<MOD1 A>"
 
-        '/// Click button 'Delete points' on 'Object Toolbar' ///'
+    printlog "Click button 'Delete points' on 'Object Toolbar'"
     Kontext "Bezierobjectbar"
-        Printlog "- Break curve"
-        if ( hClickButton( Loeschen ) = -1 ) then
-            warnlog( "Unable to click button <Loeschen>" )
-        endif
-        'try
-        '    Loeschen.Click
-        '    sleep 2
-        'catch
-        '    warnlog "Delete didn't work... why?"
-        'endcatch
+    Printlog "- Break curve"
+    if ( hClickButton( Loeschen ) = -1 ) then
+        warnlog( "Unable to click button <Loeschen>" )
+    endif
 
-        '/// Uncheck on the symbol 'Curve' on the toolbar 'Main Toolbar' ///'
+    printlog "Uncheck on the symbol 'Curve' on the toolbar 'Main Toolbar'"
     Kontext "Toolbar"
-        sleep 2
-        Toolbar.OpenContextMenu   ' Enable forms button in menuebar
-        sleep 2
-        hMenuselectNr (1)
-        sleep 2
-        hMenuItemUnCheck (7)
-        sleep 2
-    '/// Close application ///'
+    sleep 2
+    Toolbar.OpenContextMenu   ' Enable forms button in menuebar
+    sleep 2
+    hMenuselectNr (1)
+    sleep 2
+    hMenuItemUnCheck (7)
+    sleep 2
+    printlog "Close application"
     Call hCloseDocument
-endcase
+endcase 'tdBezierToolbar
 
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
+'------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc
index 7ca61a8774b5..dcb6c38795bb 100644
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -32,162 +32,164 @@
 '\******************************************************************************
 
 testcase tToolsOptionsDrawGeneral (sApplication as string)
-   dim irgendwas(9) as boolean
-   dim iMasseinheit as integer
-   dim sTabAbstand as string
-   dim iZeichnungsmasstab as integer
-   dim sTemp as string
-   dim iTemp as integer
-   dim sTemp2 as string
-   dim iTemp2 as integer
-   dim sMeasUnit as string
-
-   hNewDocument
-
-  printlog "save states"
-   ToolsOptions
-   hToolsOptions (sApplication,"General")
-
-      irgendwas(1) = Schnellbearbeitung.IsChecked
-      irgendwas(2) = TextbereichSelektierbar.IsChecked
-
-      irgendwas(3) = CacheFuerHintergrund.IsChecked
-      irgendwas(4) = KopieBeimVerschieben.IsChecked
-      irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked
-
-      if (gApplication = "DRAW") then
-          irgendwas(6) = SetzenAufKreis.IsChecked   ' DRAW
-          iZeichnungsmasstab = Zeichnungsmasstab.GetSelIndex ' DRAW
-      else ' IMPRESS
-         irgendwas(7) = MitAutopilotStarten.IsChecked
-         irgendwas(8) = MitAktuellerSeite.IsChecked
-         irgendwas(9) = AlleAbsatzabstaendeAddieren.IsChecked
-      endif
-
-      iMasseinheit = Masseinheit.GetSelIndex
-      sTabAbstand = Tabulatorabstand.GetText
-
-     printlog "all states inverting"
+    dim irgendwas(9) as boolean
+    dim iMasseinheit as integer
+    dim sTabAbstand as string
+    dim iZeichnungsmasstab as integer
+    dim sTemp as string
+    dim iTemp as integer
+    dim sTemp2 as string
+    dim iTemp2 as integer
+    dim sMeasUnit as string
 
-      if irgendwas(1) Then Schnellbearbeitung.UnCheck Else       Schnellbearbeitung.Check
-      if irgendwas(2) Then TextbereichSelektierbar.UnCheck Else  TextbereichSelektierbar.Check
-
-      if irgendwas(3) Then CacheFuerHintergrund.UnCheck     Else     CacheFuerHintergrund.Check
-      if irgendwas(4) Then KopieBeimVerschieben.UnCheck     Else     KopieBeimVerschieben.Check
-      if irgendwas(5) Then ObjekteImmerVerschiebbar.UnCheck Else ObjekteImmerVerschiebbar.Check
-
-      Tabulatorabstand.ToMax
-      sTemp = Tabulatorabstand.GetText
-      Tabulatorabstand.More
+    hNewDocument
 
-      if (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE) Then Warnlog "Something wrong, please check!"
-      Tabulatorabstand.SetText (sTabAbstand)
+    printlog "save states"
+    ToolsOptions
+    hToolsOptions (sApplication,"General")
 
-      if (gApplication = "DRAW") then
-         If ( Zeichnungsmasstab.GetItemCount <> iZeichnungsmasstab ) Then Zeichnungsmasstab.Select (Zeichnungsmasstab.GetItemCount) _
-            Else Zeichnungsmasstab.Select (1)
-         iTemp2 = Zeichnungsmasstab.GetSelIndex
-         if irgendwas(6) Then SetzenAufKreis.UnCheck Else           SetzenAufKreis.Check
-      else ' IMPRESS
-         if irgendwas(7) Then MitAutopilotStarten.UnCheck         Else  MitAutopilotStarten.Check
-         if irgendwas(8) Then MitAktuellerSeite.UnCheck           Else  MitAktuellerSeite.Check
-         if irgendwas(9) Then AlleAbsatzabstaendeAddieren.UnCheck Else  AlleAbsatzabstaendeAddieren.Check
-      endif
+    irgendwas(1) = Schnellbearbeitung.IsChecked
+    irgendwas(2) = TextbereichSelektierbar.IsChecked
 
-      printlog "<Meas.Unit> interacts with <Tap stops> and vice versa"
+    irgendwas(3) = CacheFuerHintergrund.IsChecked
+    irgendwas(4) = KopieBeimVerschieben.IsChecked
+    irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked
 
-      If ( Masseinheit.GetItemCount <> iMasseinheit ) Then Masseinheit.Select (Masseinheit.GetItemCount) _
-         Else Masseinheit.Select (1)
-      iTemp = Masseinheit.GetSelIndex
+    if (gApplication = "DRAW") then
+        irgendwas(6) = SetzenAufKreis.IsChecked   ' DRAW
+        iZeichnungsmasstab = Zeichnungsmasstab.GetSelIndex ' DRAW
+    else ' IMPRESS
+        irgendwas(7) = MitAutopilotStarten.IsChecked
+        irgendwas(8) = MitAktuellerSeite.IsChecked
+        irgendwas(9) = AlleAbsatzabstaendeAddieren.IsChecked
+    endif
 
-      sTemp = Tabulatorabstand.GetText
-      Tabulatorabstand.ToMax
-      If ( Tabulatorabstand.GetText = sTemp ) Then Tabulatorabstand.ToMin
-      sTemp = Tabulatorabstand.GetText
+    iMasseinheit = Masseinheit.GetSelIndex
+    sTabAbstand = Tabulatorabstand.GetText
 
-    Kontext "ExtrasOptionenDlg"
-    ExtrasOptionenDlg.OK
+    printlog "all states inverting"
 
-    printlog "Office quit - start"
+    if irgendwas(1) Then Schnellbearbeitung.UnCheck Else       Schnellbearbeitung.Check
+    if irgendwas(2) Then TextbereichSelektierbar.UnCheck Else  TextbereichSelektierbar.Check
 
-    ExitRestartTheOffice
-    printlog "opening new doc to get the Options"
-    Call hNewDocument
-    printlog "checking states"
-    ToolsOptions
-    hToolsOptions (sApplication,"General")
+    if irgendwas(3) Then CacheFuerHintergrund.UnCheck     Else     CacheFuerHintergrund.Check
+    if irgendwas(4) Then KopieBeimVerschieben.UnCheck     Else     KopieBeimVerschieben.Check
+    if irgendwas(5) Then ObjekteImmerVerschiebbar.UnCheck Else ObjekteImmerVerschiebbar.Check
 
-      If ( irgendwas(1) = Schnellbearbeitung.IsChecked         ) Then WarnLog "Allow Quick Editing state changed"
-      If ( irgendwas(2) = TextbereichSelektierbar.IsChecked    ) Then WarnLog "Only Text Area Selectable state changed"
+    Tabulatorabstand.ToMax
+    sTemp = Tabulatorabstand.GetText
+    Tabulatorabstand.More
 
-      If ( irgendwas(3) = CacheFuerHintergrund.IsChecked       ) Then WarnLog "Use Background Cache state changed"
-      If ( irgendwas(4) = KopieBeimVerschieben.IsChecked       ) Then WarnLog "Copy When Moving state changed"
-      If ( irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked   ) Then WarnLog "Objects Always Movable state changed"
+    if (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE) Then Warnlog "Something wrong, please check!"
+        Tabulatorabstand.SetText (sTabAbstand)
 
-      if (gApplication = "DRAW") then
+        if (gApplication = "DRAW") then
+            If ( Zeichnungsmasstab.GetItemCount <> iZeichnungsmasstab ) Then
+                Zeichnungsmasstab.Select (Zeichnungsmasstab.GetItemCount) _
+            Else Zeichnungsmasstab.Select (1)
+                iTemp2 = Zeichnungsmasstab.GetSelIndex
+                if irgendwas(6) Then SetzenAufKreis.UnCheck Else           SetzenAufKreis.Check
+            endif
+            else ' IMPRESS
+            if irgendwas(7) Then MitAutopilotStarten.UnCheck         Else  MitAutopilotStarten.Check
+            if irgendwas(8) Then MitAktuellerSeite.UnCheck           Else  MitAktuellerSeite.Check
+            if irgendwas(9) Then AlleAbsatzabstaendeAddieren.UnCheck Else  AlleAbsatzabstaendeAddieren.Check
+        endif
+
+        printlog "<Meas.Unit> interacts with <Tap stops> and vice versa"
+
+        If ( Masseinheit.GetItemCount <> iMasseinheit ) Then Masseinheit.Select (Masseinheit.GetItemCount) _
+        Else Masseinheit.Select (1)
+        iTemp = Masseinheit.GetSelIndex
+
+        sTemp = Tabulatorabstand.GetText
+        Tabulatorabstand.ToMax
+        If ( Tabulatorabstand.GetText = sTemp ) Then Tabulatorabstand.ToMin
+        sTemp = Tabulatorabstand.GetText
+
+        Kontext "ExtrasOptionenDlg"
+        ExtrasOptionenDlg.OK
+
+        printlog "Office quit - start"
+
+        ExitRestartTheOffice
+        printlog "opening new doc to get the Options"
+        Call hNewDocument
+        printlog "checking states"
+        ToolsOptions
+        hToolsOptions (sApplication,"General")
+
+        If ( irgendwas(1) = Schnellbearbeitung.IsChecked         ) Then WarnLog "Allow Quick Editing state changed"
+        If ( irgendwas(2) = TextbereichSelektierbar.IsChecked    ) Then WarnLog "Only Text Area Selectable state changed"
+
+        If ( irgendwas(3) = CacheFuerHintergrund.IsChecked       ) Then WarnLog "Use Background Cache state changed"
+        If ( irgendwas(4) = KopieBeimVerschieben.IsChecked       ) Then WarnLog "Copy When Moving state changed"
+        If ( irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked   ) Then WarnLog "Objects Always Movable state changed"
+
+        if (gApplication = "DRAW") then
          If ( Zeichnungsmasstab.GetSelIndex <> iTemp2 ) Then WarnLog "Drawing Scale state changed BUG #97391 is:"+Zeichnungsmasstab.GetSelIndex+"; should: "+iTemp2
          If ( irgendwas(6) = SetzenAufKreis.IsChecked             ) Then WarnLog "'Do not disort objects in curve' state changed"
-      else ' IMPRESS
+        else ' IMPRESS
          if ( irgendwas(7) = MitAutopilotStarten.IsChecked          ) Then WarnLog "'Start with AutoPilot' state changed."
-'         
+        '
          if ( irgendwas(8) = MitAktuellerSeite.IsChecked            ) Then WarnLog "'Always with current page' changed"
          if ( irgendwas(9) = AlleAbsatzabstaendeAddieren.IsChecked  ) Then WarnLog "'Add spacing between paragraphs in the current document' changed"
-      endif
-
-      If ( Masseinheit.GetSelIndex <> iTemp ) Then WarnLog "Unit of Measurement state changed"
-      If (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE ) Then WarnLog "Tab stops state changed - watch BugID: 82744 for Status"
-
-  printlog "all UnCheck -> o"
-
-      Schnellbearbeitung.UnCheck
-      TextbereichSelektierbar.UnCheck
-
-      CacheFuerHintergrund.UnCheck
-      KopieBeimVerschieben.UnCheck
-      ObjekteImmerVerschiebbar.UnCheck
-
-      if (gApplication = "DRAW") then
-         Zeichnungsmasstab.Select (1)
-         SetzenAufKreis.UnCheck
-      else ' IMPRESS
-         MitAutopilotStarten.UnCheck
-         MitAktuellerSeite.UnCheck
-         AlleAbsatzabstaendeAddieren.UnCheck
-      endif
-
-      Masseinheit.Select (1)
-      Tabulatorabstand.ToMin
-      sTemp = Tabulatorabstand.GetText
-     printlog " More test "
-      Tabulatorabstand.More
-      if ( sTemp = Tabulatorabstand.GetText ) Then WarnLog "Tab Stops More-Button not working; stemp1: "+sTemp + " =? (2) " +Tabulatorabstand.GetText
-      sTemp = Tabulatorabstand.GetText
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-  printlog "check if all UnChecked"
-   ToolsOptions
-   hToolsOptions (sApplication,"General")
-
-      If Schnellbearbeitung.IsChecked        Then WarnLog "Allow Quick Editing x"
-      If TextbereichSelektierbar.IsChecked   Then WarnLog "Only Text Area Selectable x"
-
-      If CacheFuerHintergrund.IsChecked      Then WarnLog "Use Background Cache x"
-      If KopieBeimVerschieben.IsChecked      Then WarnLog "Copy When Moving x"
-      If ObjekteImmerVerschiebbar.IsChecked  Then WarnLog "Objects Always Movable x"
-
-      if (gApplication = "DRAW") then
-         If ( Zeichnungsmasstab.GetSelIndex <> 1 ) Then WarnLog "'Drawing Scale' is not item 1"
-         If SetzenAufKreis.IsChecked            Then WarnLog "'Do not disort objects in curve' x"
-      else ' IMPRESS
-         if MitAutopilotStarten.IsChecked         Then WarnLog "Start with AutoPilot x"
-         if MitAktuellerSeite.IsChecked           Then WarnLog "'Always with current page' x"
-         if AlleAbsatzabstaendeAddieren.IsChecked Then WarnLog "'Add spacing between paragraphs in the current document' x"
-      endif
-
-      If ( Masseinheit.GetSelIndex <> 1 ) Then WarnLog "Unit of Measurement is not item 1"
-      If (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE ) Then WarnLog "Tab stops is not min. is: " +Tabulatorabstand.GetText + " should: " +sTemp
+        endif
+
+        If ( Masseinheit.GetSelIndex <> iTemp ) Then WarnLog "Unit of Measurement state changed"
+        If (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE ) Then WarnLog "Tab stops state changed - watch BugID: 82744 for Status"
+
+        printlog "all UnCheck -> o"
+
+        Schnellbearbeitung.UnCheck
+        TextbereichSelektierbar.UnCheck
+
+        CacheFuerHintergrund.UnCheck
+        KopieBeimVerschieben.UnCheck
+        ObjekteImmerVerschiebbar.UnCheck
+
+        if (gApplication = "DRAW") then
+            Zeichnungsmasstab.Select (1)
+            SetzenAufKreis.UnCheck
+        else ' IMPRESS
+            MitAutopilotStarten.UnCheck
+            MitAktuellerSeite.UnCheck
+            AlleAbsatzabstaendeAddieren.UnCheck
+        endif
+
+        Masseinheit.Select (1)
+        Tabulatorabstand.ToMin
+        sTemp = Tabulatorabstand.GetText
+        printlog " More test "
+        Tabulatorabstand.More
+        if ( sTemp = Tabulatorabstand.GetText ) Then WarnLog "Tab Stops More-Button not working; stemp1: "+sTemp + " =? (2) " +Tabulatorabstand.GetText
+            sTemp = Tabulatorabstand.GetText
+
+        Kontext "ExtrasOptionenDlg"
+        ExtrasOptionenDlg.OK
+
+        printlog "check if all UnChecked"
+        ToolsOptions
+        hToolsOptions (sApplication,"General")
+
+        If Schnellbearbeitung.IsChecked        Then WarnLog "Allow Quick Editing x"
+        If TextbereichSelektierbar.IsChecked   Then WarnLog "Only Text Area Selectable x"
+
+        If CacheFuerHintergrund.IsChecked      Then WarnLog "Use Background Cache x"
+        If KopieBeimVerschieben.IsChecked      Then WarnLog "Copy When Moving x"
+        If ObjekteImmerVerschiebbar.IsChecked  Then WarnLog "Objects Always Movable x"
+
+        if (gApplication = "DRAW") then
+            If ( Zeichnungsmasstab.GetSelIndex <> 1 ) Then WarnLog "'Drawing Scale' is not item 1"
+            If SetzenAufKreis.IsChecked            Then WarnLog "'Do not disort objects in curve' x"
+        else ' IMPRESS
+            if MitAutopilotStarten.IsChecked         Then WarnLog "Start with AutoPilot x"
+            if MitAktuellerSeite.IsChecked           Then WarnLog "'Always with current page' x"
+            if AlleAbsatzabstaendeAddieren.IsChecked Then WarnLog "'Add spacing between paragraphs in the current document' x"
+        endif
+
+        If ( Masseinheit.GetSelIndex <> 1 ) Then WarnLog "Unit of Measurement is not item 1"
+        If (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE ) Then WarnLog "Tab stops is not min. is: " +Tabulatorabstand.GetText + " should: " +sTemp
 
    Kontext "ExtrasOptionenDlg"
    ExtrasOptionenDlg.OK
@@ -198,56 +200,51 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
     hNewDocument
 
     printlog "set Default Tab Stop to 2,5cm"
-   ToolsOptions
-   hToolsOptions (sApplication,"General")
-      Masseinheit.Select (2) ' cm
-      sMeasUnit = GetMeasUnit(Tabulatorabstand.GetText)
-'         printlog "before " + Tabulatorabstand.GetText
-      Tabulatorabstand.SetText ("2" + GetDecimalSeperator(Tabulatorabstand.GetText) + "50"+ sMeasUnit)
-'         printlog "after " + Tabulatorabstand.GetText
-'         printlog "seperator: " + GetDecimalSeperator(Tabulatorabstand.GetText)
-'         printlog "generated string: " + "2" + GetDecimalSeperator(Tabulatorabstand.GetText) + "50cm"
+    ToolsOptions
+    hToolsOptions (sApplication,"General")
+    Masseinheit.Select (2) ' cm
+    sMeasUnit = GetMeasUnit(Tabulatorabstand.GetText)
+    '         printlog "before " + Tabulatorabstand.GetText
+    Tabulatorabstand.SetText ("2" + GetDecimalSeperator(Tabulatorabstand.GetText) + "50"+ sMeasUnit)
+    '         printlog "after " + Tabulatorabstand.GetText
+    '         printlog "seperator: " + GetDecimalSeperator(Tabulatorabstand.GetText)
+    '         printlog "generated string: " + "2" + GetDecimalSeperator(Tabulatorabstand.GetText) + "50cm"
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
     printlog "creating document with tabstops and save it"
-   if (gApplication = "DRAW") then
-      kontext "Toolbar"
-      Textfield.Click
-      kontext "DocumentDraw"
-      hMouseClick DocumentDraw,50,50
-   else
-      kontext "Toolbar"
-      Textfield.Click
-      kontext "DocumentImpress"
-      hMouseClick DocumentImpress,20,50
-   endif
-   hTypeKeys "a<Tab>b<Tab>c<Tab>d<Tab>e<Tab>f<Tab>g<Tab>h<Tab>i<Tab>j"
-   
-   
+    if (gApplication = "DRAW") then
+        kontext "Toolbar"
+        Textfield.Click
+        kontext "DocumentDraw"
+        hMouseClick DocumentDraw,50,50
+    else
+        kontext "Toolbar"
+        Textfield.Click
+        kontext "DocumentImpress"
+        hMouseClick DocumentImpress,20,50
+    endif
+    hTypeKeys "a<Tab>b<Tab>c<Tab>d<Tab>e<Tab>f<Tab>g<Tab>h<Tab>i<Tab>j"
     if ( gApplication = "IMPRESS" ) then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
-   
     hFileSaveAsKill (gOfficePath + "user\work\tab25cm." & ExtensionString )
-
-   hCloseDocument
-   sleep (2)
-
+    hCloseDocument
+    sleep (2)
     printlog "change tab stops"
-   hNewDocument
+    hNewDocument
     printlog "Changed the Default Tab Stop to 2,9cm"
-   ToolsOptions
-   hToolsOptions (sApplication,"General")
-      Masseinheit.Select (2) ' cm
-'         printlog "before " + Tabulatorabstand.GetText
-      Tabulatorabstand.SetText ("2" + GetDecimalSeperator(Tabulatorabstand.GetText) + "90"+sMeasUnit )
-'         printlog "after " + Tabulatorabstand.GetText
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   sleep (2)
+    ToolsOptions
+    hToolsOptions (sApplication,"General")
+    Masseinheit.Select (2) ' cm
+    '         printlog "before " + Tabulatorabstand.GetText
+    Tabulatorabstand.SetText ("2" + GetDecimalSeperator(Tabulatorabstand.GetText) + "90"+sMeasUnit )
+    '         printlog "after " + Tabulatorabstand.GetText
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
+    sleep (2)
 
 
 
@@ -271,98 +268,98 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
     hCloseDocument
 
 '---------------------------------------------------------------------------------
-     Printlog ("'/// - all Check -> x ///")
+    Printlog ("all Check -> x")
 
-     printlog "Click in the open impress document to get the focus back to the document"
-     printlog "Otherwise it sometimes happend that the Tools/Option dialog doesn't display the correct applications"
-     hNewDocument
-     if ( sApplication = "IMPRESS") then
+    printlog "Click in the open impress document to get the focus back to the document"
+    printlog "Otherwise it sometimes happend that the Tools/Option dialog doesn't display the correct applications"
+    hNewDocument
+    if ( sApplication = "IMPRESS") then
         Kontext "DocumentImpress"
-            DocumentImpress.MouseDown(50,50)
-            DocumentImpress.MouseUp(50,50)
-     else
+        DocumentImpress.MouseDown(50,50)
+        DocumentImpress.MouseUp(50,50)
+    else
         Kontext "DocumentDraw"
-            DocumentDraw.MouseDown(50,50)
-            DocumentDraw.MouseUp(50,50)
-     endif
+        DocumentDraw.MouseDown(50,50)
+        DocumentDraw.MouseUp(50,50)
+    endif
 
 
-   ToolsOptions
-   hToolsOptions (sApplication,"General")
-   kontext "TabSonstigesDraw"
-      Schnellbearbeitung.Check
-      TextbereichSelektierbar.Check
+    ToolsOptions
+    hToolsOptions (sApplication,"General")
+    kontext "TabSonstigesDraw"
+    Schnellbearbeitung.Check
+    TextbereichSelektierbar.Check
 
-      CacheFuerHintergrund.Check
-      KopieBeimVerschieben.Check
-      ObjekteImmerVerschiebbar.Check
+    CacheFuerHintergrund.Check
+    KopieBeimVerschieben.Check
+    ObjekteImmerVerschiebbar.Check
 
-      if (gApplication = "DRAW") then
+    if (gApplication = "DRAW") then
          Zeichnungsmasstab.Select (2)
          itemp2 = Zeichnungsmasstab.GetSelIndex
          SetzenAufKreis.Check
-      else ' IMPRESS
-'         MitAutopilotStarten.Check
+    else ' IMPRESS
+        '         MitAutopilotStarten.Check
          MitAktuellerSeite.Check
          AlleAbsatzabstaendeAddieren.Check
-      endif
+    endif
 
-      Masseinheit.Select (2)
-      itemp = Masseinheit.GetSelIndex
-      sTemp = "3" + GetDecimalSeperator(Tabulatorabstand.GetText) + "21"+sMeasUnit
-      Tabulatorabstand.SetText (sTemp)
+    Masseinheit.Select (2)
+    itemp = Masseinheit.GetSelIndex
+    sTemp = "3" + GetDecimalSeperator(Tabulatorabstand.GetText) + "21"+sMeasUnit
+    Tabulatorabstand.SetText (sTemp)
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-  printlog ("'/// - check if all Checked ///")
-   ToolsOptions
-   hToolsOptions (sApplication,"General")
+    printlog ("check if all Checked")
+    ToolsOptions
+    hToolsOptions (sApplication,"General")
 
-      If True <> Schnellbearbeitung.IsChecked        Then WarnLog "Allow Quick Editing o"
-      If True <> TextbereichSelektierbar.IsChecked   Then WarnLog "Only Text Area Selectable o"
+    If True <> Schnellbearbeitung.IsChecked        Then WarnLog "Allow Quick Editing o"
+    If True <> TextbereichSelektierbar.IsChecked   Then WarnLog "Only Text Area Selectable o"
 
-      If True <> CacheFuerHintergrund.IsChecked      Then WarnLog "Use Background Cache o i26631"
-      If True <> KopieBeimVerschieben.IsChecked      Then WarnLog "Copy When Moving o"
-      If True <> ObjekteImmerVerschiebbar.IsChecked  Then WarnLog "Objects Always Movable o"
+    If True <> CacheFuerHintergrund.IsChecked      Then WarnLog "Use Background Cache o i26631"
+    If True <> KopieBeimVerschieben.IsChecked      Then WarnLog "Copy When Moving o"
+    If True <> ObjekteImmerVerschiebbar.IsChecked  Then WarnLog "Objects Always Movable o"
 
-      if (gApplication = "DRAW") then
-         If ( Zeichnungsmasstab.GetSelIndex <> iTemp2 ) Then WarnLog "Drawing Scale is not item " + iTemp2 + " it's: " + Zeichnungsmasstab.GetSelIndex
-         If True <> SetzenAufKreis.IsChecked            Then WarnLog "'Do not disort objects in curve' o"
-      else ' IMPRESS
-'         If True <> MitAutopilotStarten.IsChecked         Then WarnLog "Start with AutoPilot o"
-         If True <> MitAktuellerSeite.IsChecked           Then WarnLog "'Always with current page' o"
-         If True <> AlleAbsatzabstaendeAddieren.IsChecked Then WarnLog "'Add spacing between paragraphs in the current document' o"
-      endif
+    if (gApplication = "DRAW") then
+    If ( Zeichnungsmasstab.GetSelIndex <> iTemp2 ) Then WarnLog "Drawing Scale is not item " + iTemp2 + " it's: " + Zeichnungsmasstab.GetSelIndex
+    If True <> SetzenAufKreis.IsChecked            Then WarnLog "'Do not disort objects in curve' o"
+    else ' IMPRESS
+    '         If True <> MitAutopilotStarten.IsChecked         Then WarnLog "Start with AutoPilot o"
+    If True <> MitAktuellerSeite.IsChecked           Then WarnLog "'Always with current page' o"
+    If True <> AlleAbsatzabstaendeAddieren.IsChecked Then WarnLog "'Add spacing between paragraphs in the current document' o"
+    endif
 
-      If ( Masseinheit.GetSelIndex <> iTemp ) Then WarnLog "Masseinheit is not item " + iTemp + " it's: " + Masseinheit.GetSelIndex
-      If (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE ) Then WarnLog "Tab stops is not " + sTemp + " it's: " + Tabulatorabstand.GetText
+    If ( Masseinheit.GetSelIndex <> iTemp ) Then WarnLog "Masseinheit is not item " + iTemp + " it's: " + Masseinheit.GetSelIndex
+    If (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE ) Then WarnLog "Tab stops is not " + sTemp + " it's: " + Tabulatorabstand.GetText
 
-  printlog "restore states"
+    printlog "restore states"
 
-      If ( irgendwas(1) = TRUE ) Then  Schnellbearbeitung.Check Else       Schnellbearbeitung.UnCheck
-      If ( irgendwas(2) = TRUE ) Then  TextbereichSelektierbar.Check Else  TextbereichSelektierbar.UnCheck
+    If ( irgendwas(1) = TRUE ) Then  Schnellbearbeitung.Check Else       Schnellbearbeitung.UnCheck
+    If ( irgendwas(2) = TRUE ) Then  TextbereichSelektierbar.Check Else  TextbereichSelektierbar.UnCheck
 
-      If ( irgendwas(3) = TRUE ) Then  CacheFuerHintergrund.Check Else     CacheFuerHintergrund.UnCheck
-      If ( irgendwas(4) = TRUE ) Then  KopieBeimVerschieben.Check Else     KopieBeimVerschieben.UnCheck
-      If ( irgendwas(5) = TRUE ) Then  ObjekteImmerVerschiebbar.Check Else ObjekteImmerVerschiebbar.UnCheck
+    If ( irgendwas(3) = TRUE ) Then  CacheFuerHintergrund.Check Else     CacheFuerHintergrund.UnCheck
+    If ( irgendwas(4) = TRUE ) Then  KopieBeimVerschieben.Check Else     KopieBeimVerschieben.UnCheck
+    If ( irgendwas(5) = TRUE ) Then  ObjekteImmerVerschiebbar.Check Else ObjekteImmerVerschiebbar.UnCheck
 
-      if (gApplication = "DRAW") then
-         Zeichnungsmasstab.Select (iZeichnungsmasstab)
-         If ( irgendwas(6) = TRUE ) Then  SetzenAufKreis.Check Else           SetzenAufKreis.UnCheck
-      else ' IMPRESS
-         if ( irgendwas(7) = TRUE ) Then MitAutopilotStarten.Check         Else  MitAutopilotStarten.UnCheck
-         if ( irgendwas(8) = TRUE ) Then MitAktuellerSeite.Check           Else  MitAktuellerSeite.UnCheck
-         if ( irgendwas(9) = TRUE ) Then AlleAbsatzabstaendeAddieren.Check Else  AlleAbsatzabstaendeAddieren.UnCheck
-      endif
+    if (gApplication = "DRAW") then
+        Zeichnungsmasstab.Select (iZeichnungsmasstab)
+        If ( irgendwas(6) = TRUE ) Then  SetzenAufKreis.Check Else           SetzenAufKreis.UnCheck
+    else ' IMPRESS
+        if ( irgendwas(7) = TRUE ) Then MitAutopilotStarten.Check         Else  MitAutopilotStarten.UnCheck
+        if ( irgendwas(8) = TRUE ) Then MitAktuellerSeite.Check           Else  MitAktuellerSeite.UnCheck
+        if ( irgendwas(9) = TRUE ) Then AlleAbsatzabstaendeAddieren.Check Else  AlleAbsatzabstaendeAddieren.UnCheck
+    endif
 
-      Masseinheit.Select (iMasseinheit) 'sw:ListBox:TP_LAYOUT_O
-      Tabulatorabstand.SetText (sTabAbstand) '     sw:MetricField:TP_LAYOUT_OPT:MF_TAB
+    Masseinheit.Select (iMasseinheit) 'sw:ListBox:TP_LAYOUT_O
+    Tabulatorabstand.SetText (sTabAbstand) '     sw:MetricField:TP_LAYOUT_OPT:MF_TAB
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-   hCloseDocument
+    hCloseDocument
 endcase 'tToolsOptionsDrawGeneral
 
 '------------------------------------------------------------------------------
@@ -406,143 +403,143 @@ testcase tToolsOptionsDrawView (sApplication as string)
 
     printlog "all UnCheck -> o"
 
-      LinealeSichtbar.UnCheck
-      HilfslinienBeimBewegen.UnCheck
-      KontrolpunkteImBezierEditor.UnCheck
-      KonturFuerIndividuelleObjekte.UnCheck
+    LinealeSichtbar.UnCheck
+    HilfslinienBeimBewegen.UnCheck
+    KontrolpunkteImBezierEditor.UnCheck
+    KonturFuerIndividuelleObjekte.UnCheck
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-  printlog "check if all UnChecked"
-   ToolsOptions
-   hToolsOptions (sApplication,"View")
+    printlog "check if all UnChecked"
+    ToolsOptions
+    hToolsOptions (sApplication,"View")
 
-      If LinealeSichtbar.IsChecked                Then WarnLog "Rulers Visible x"
-      If HilfslinienBeimBewegen.IsChecked         Then WarnLog "Guides When Moving x"
-      If KontrolpunkteImBezierEditor.IsChecked    Then WarnLog "'All Control Points In B�zier Editor' x"
-      If KonturFuerIndividuelleObjekte.IsChecked  Then WarnLog "'Contour of Each Individual Object' x"
+    If LinealeSichtbar.IsChecked                Then WarnLog "Rulers Visible x"
+    If HilfslinienBeimBewegen.IsChecked         Then WarnLog "Guides When Moving x"
+    If KontrolpunkteImBezierEditor.IsChecked    Then WarnLog "'All Control Points In B�zier Editor' x"
+    If KonturFuerIndividuelleObjekte.IsChecked  Then WarnLog "'Contour of Each Individual Object' x"
 
-     Printlog "all Check -> x"
+    Printlog "all Check -> x"
 
-      LinealeSichtbar.Check
-      HilfslinienBeimBewegen.Check
-      KontrolpunkteImBezierEditor.Check
-      KonturFuerIndividuelleObjekte.Check
+    LinealeSichtbar.Check
+    HilfslinienBeimBewegen.Check
+    KontrolpunkteImBezierEditor.Check
+    KonturFuerIndividuelleObjekte.Check
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-  printlog "check if all Checked"
-   ToolsOptions
-   hToolsOptions (sApplication,"View")
+    printlog "check if all Checked"
+    ToolsOptions
+    hToolsOptions (sApplication,"View")
 
-      If True <> LinealeSichtbar.IsChecked               Then WarnLog "Rulers Visible o"
-      If True <> HilfslinienBeimBewegen.IsChecked        Then WarnLog "Guides When Moving o"
-      If True <> KontrolpunkteImBezierEditor.IsChecked   Then WarnLog "'All Control Points In B�zier Editor' o"
-      If True <> KonturFuerIndividuelleObjekte.IsChecked Then WarnLog "'Contour of Each Individual Object' o"
+    If True <> LinealeSichtbar.IsChecked               Then WarnLog "Rulers Visible o"
+    If True <> HilfslinienBeimBewegen.IsChecked        Then WarnLog "Guides When Moving o"
+    If True <> KontrolpunkteImBezierEditor.IsChecked   Then WarnLog "'All Control Points In B�zier Editor' o"
+    If True <> KonturFuerIndividuelleObjekte.IsChecked Then WarnLog "'Contour of Each Individual Object' o"
 
-  printlog "restore states"
+    printlog "restore states"
 
-      If ( irgendwas(1) = TRUE ) Then  LinealeSichtbar.Check               Else LinealeSichtbar.UnCheck
-      If ( irgendwas(2) = TRUE ) Then  HilfslinienBeimBewegen.Check        Else HilfslinienBeimBewegen.UnCheck
-      If ( irgendwas(3) = TRUE ) Then  KontrolpunkteImBezierEditor.Check   Else KontrolpunkteImBezierEditor.UnCheck
-      If ( irgendwas(4) = TRUE ) Then  KonturFuerIndividuelleObjekte.Check Else KonturFuerIndividuelleObjekte.UnCheck
+    If ( irgendwas(1) = TRUE ) Then  LinealeSichtbar.Check               Else LinealeSichtbar.UnCheck
+    If ( irgendwas(2) = TRUE ) Then  HilfslinienBeimBewegen.Check        Else HilfslinienBeimBewegen.UnCheck
+    If ( irgendwas(3) = TRUE ) Then  KontrolpunkteImBezierEditor.Check   Else KontrolpunkteImBezierEditor.UnCheck
+    If ( irgendwas(4) = TRUE ) Then  KonturFuerIndividuelleObjekte.Check Else KonturFuerIndividuelleObjekte.UnCheck
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-   hCloseDocument
+    hCloseDocument
 endcase 'tToolsOptionsDrawView
 
 '--------------------------------------------------------------------------------
 
 testcase tToolsOptionsDrawGrid (sApplication as string)
-   dim irgendwas(10) as boolean
-   dim sMetricField(7) as string      ' MetricField
-   dim sTempMetricField(7) as string
-   dim iTry as integer ' some increment variable
+    dim irgendwas(10) as boolean
+    dim sMetricField(7) as string      ' MetricField
+    dim sTempMetricField(7) as string
+    dim iTry as integer ' some increment variable
 
-    if ( gApplication = "IMPRESS" ) then 
+    if ( gApplication = "IMPRESS" ) then
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
 
-   hNewDocument
-
-  printlog "save states"
-   ToolsOptions
-   hToolsOptions (sApplication,"Grid")
-
-      irgendwas(1) = FangrasterBenutzen.IsChecked
-      irgendwas(2) = RasterSichtbar.IsChecked
-
-      irgendwas(3) = AchsenSynchronisieren.IsChecked
-
-      irgendwas(4) = AnFanglinien.IsChecked
-      irgendwas(5) = AnSeitenraendern.IsChecked
-      irgendwas(6) = AmObjektrahmen.IsChecked
-      irgendwas(7) = AnObjektpunkten.IsChecked
-
-      irgendwas(8) = BeimErzeugenUndBewegen.IsChecked
-      irgendwas(9) = LaengereKantenlaenge.IsChecked
-      irgendwas(10)= BeimDrehen.IsChecked
-      if BeimDrehen.IsChecked then sMetricField(7) = Winkel.getText
-
-      sMetricField(1) = RasterAufloesungXAchse.GetText
-      sMetricField(2) = RasterAufloesungYAchse.GetText
-      sMetricField(3) = RasterUnterteilungXAchse.GetText
-      sMetricField(4) = RasterUnterteilungYAchse.GetText
-      sMetricField(5) = FangenFangbereich.GetText
-      sMetricField(6) = Punktreduktion.GetText
-
-     printlog "all states inverting"
-
-      if irgendwas(1) Then FangrasterBenutzen.UnCheck      Else FangrasterBenutzen.Check
-      if irgendwas(2) Then RasterSichtbar.UnCheck          Else RasterSichtbar.Check
-
-'      if irgendwas(3) Then AchsenSynchronisieren.UnCheck   Else AchsenSynchronisieren.Check
- '   this CheckBox interacts with the MetricBoxes:
-       AchsenSynchronisieren.UnCheck
-
-      if irgendwas(4) Then AnFanglinien.UnCheck            Else AnFanglinien.Check
-      if irgendwas(5) Then AnSeitenraendern.UnCheck        Else AnSeitenraendern.Check
-      if irgendwas(6) Then AmObjektrahmen.UnCheck          Else AmObjektrahmen.Check
-      if irgendwas(7) Then AnObjektpunkten.UnCheck         Else AnObjektpunkten.Check
-
-      if irgendwas(8) Then BeimErzeugenUndBewegen.UnCheck  Else BeimErzeugenUndBewegen.Check
-      if irgendwas(9) Then LaengereKantenlaenge.UnCheck    Else LaengereKantenlaenge.Check
-      if irgendwas(10)Then BeimDrehen.UnCheck              Else BeimDrehen.Check
-
-      sTempMetricField(1) = RasterAufloesungXAchse.GetText
-      sTempMetricField(2) = RasterAufloesungYAchse.GetText
-      sTempMetricField(3) = RasterUnterteilungXAchse.GetText
-      sTempMetricField(4) = RasterUnterteilungYAchse.GetText
-      sTempMetricField(5) = FangenFangbereich.GetText
-      sTempMetricField(6) = Punktreduktion.GetText
-      RasterAufloesungXAchse.ToMax
-      RasterAufloesungYAchse.ToMin
-      RasterUnterteilungXAchse.ToMin
-      RasterUnterteilungYAchse.ToMax
-      FangenFangbereich.ToMin
-      Punktreduktion.ToMax
-      If ( RasterAufloesungXAchse.GetText =   sTempMetricField(1) ) Then RasterAufloesungXAchse.ToMin
-      If ( RasterAufloesungYAchse.GetText =   sTempMetricField(2) ) Then RasterAufloesungYAchse.ToMax
-      If ( RasterUnterteilungXAchse.GetText = sTempMetricField(3) ) Then RasterUnterteilungXAchse.ToMax
-      If ( RasterUnterteilungYAchse.GetText = sTempMetricField(4) ) Then RasterUnterteilungYAchse.ToMin
-      If ( FangenFangbereich.GetText = sTempMetricField(5) ) Then FangenFangbereich.ToMax
-      If ( Punktreduktion.GetText = sTempMetricField(6) ) Then Punktreduktion.ToMin
-     RasterAufloesungXAchse.More  ' because it must greater than the.min value for the subdivisions if they are .tomax!
-     RasterAufloesungXAchse.More
-     RasterAufloesungYAchse.More
-     RasterAufloesungYAchse.More
-      sTempMetricField(1) = RasterAufloesungXAchse.GetText
-      sTempMetricField(2) = RasterAufloesungYAchse.GetText
-      sTempMetricField(3) = RasterUnterteilungXAchse.GetText
-      sTempMetricField(4) = RasterUnterteilungYAchse.GetText
-      sTempMetricField(5) = FangenFangbereich.GetText
-      sTempMetricField(6) = Punktreduktion.GetText
+    hNewDocument
+
+    printlog "save states"
+    ToolsOptions
+    hToolsOptions (sApplication,"Grid")
+
+    irgendwas(1) = FangrasterBenutzen.IsChecked
+    irgendwas(2) = RasterSichtbar.IsChecked
+
+    irgendwas(3) = AchsenSynchronisieren.IsChecked
+
+    irgendwas(4) = AnFanglinien.IsChecked
+    irgendwas(5) = AnSeitenraendern.IsChecked
+    irgendwas(6) = AmObjektrahmen.IsChecked
+    irgendwas(7) = AnObjektpunkten.IsChecked
+
+    irgendwas(8) = BeimErzeugenUndBewegen.IsChecked
+    irgendwas(9) = LaengereKantenlaenge.IsChecked
+    irgendwas(10)= BeimDrehen.IsChecked
+    if BeimDrehen.IsChecked then sMetricField(7) = Winkel.getText
+
+    sMetricField(1) = RasterAufloesungXAchse.GetText
+    sMetricField(2) = RasterAufloesungYAchse.GetText
+    sMetricField(3) = RasterUnterteilungXAchse.GetText
+    sMetricField(4) = RasterUnterteilungYAchse.GetText
+    sMetricField(5) = FangenFangbereich.GetText
+    sMetricField(6) = Punktreduktion.GetText
+
+    printlog "all states inverting"
+
+    if irgendwas(1) Then FangrasterBenutzen.UnCheck      Else FangrasterBenutzen.Check
+    if irgendwas(2) Then RasterSichtbar.UnCheck          Else RasterSichtbar.Check
+
+    '      if irgendwas(3) Then AchsenSynchronisieren.UnCheck   Else AchsenSynchronisieren.Check
+    '   this CheckBox interacts with the MetricBoxes:
+    AchsenSynchronisieren.UnCheck
+
+    if irgendwas(4) Then AnFanglinien.UnCheck            Else AnFanglinien.Check
+    if irgendwas(5) Then AnSeitenraendern.UnCheck        Else AnSeitenraendern.Check
+    if irgendwas(6) Then AmObjektrahmen.UnCheck          Else AmObjektrahmen.Check
+    if irgendwas(7) Then AnObjektpunkten.UnCheck         Else AnObjektpunkten.Check
+
+    if irgendwas(8) Then BeimErzeugenUndBewegen.UnCheck  Else BeimErzeugenUndBewegen.Check
+    if irgendwas(9) Then LaengereKantenlaenge.UnCheck    Else LaengereKantenlaenge.Check
+    if irgendwas(10)Then BeimDrehen.UnCheck              Else BeimDrehen.Check
+
+    sTempMetricField(1) = RasterAufloesungXAchse.GetText
+    sTempMetricField(2) = RasterAufloesungYAchse.GetText
+    sTempMetricField(3) = RasterUnterteilungXAchse.GetText
+    sTempMetricField(4) = RasterUnterteilungYAchse.GetText
+    sTempMetricField(5) = FangenFangbereich.GetText
+    sTempMetricField(6) = Punktreduktion.GetText
+    RasterAufloesungXAchse.ToMax
+    RasterAufloesungYAchse.ToMin
+    RasterUnterteilungXAchse.ToMin
+    RasterUnterteilungYAchse.ToMax
+    FangenFangbereich.ToMin
+    Punktreduktion.ToMax
+    If ( RasterAufloesungXAchse.GetText =   sTempMetricField(1) ) Then RasterAufloesungXAchse.ToMin
+    If ( RasterAufloesungYAchse.GetText =   sTempMetricField(2) ) Then RasterAufloesungYAchse.ToMax
+    If ( RasterUnterteilungXAchse.GetText = sTempMetricField(3) ) Then RasterUnterteilungXAchse.ToMax
+    If ( RasterUnterteilungYAchse.GetText = sTempMetricField(4) ) Then RasterUnterteilungYAchse.ToMin
+    If ( FangenFangbereich.GetText = sTempMetricField(5) ) Then FangenFangbereich.ToMax
+    If ( Punktreduktion.GetText = sTempMetricField(6) ) Then Punktreduktion.ToMin
+    RasterAufloesungXAchse.More  ' because it must greater than the.min value for the subdivisions if they are .tomax!
+    RasterAufloesungXAchse.More
+    RasterAufloesungYAchse.More
+    RasterAufloesungYAchse.More
+    sTempMetricField(1) = RasterAufloesungXAchse.GetText
+    sTempMetricField(2) = RasterAufloesungYAchse.GetText
+    sTempMetricField(3) = RasterUnterteilungXAchse.GetText
+    sTempMetricField(4) = RasterUnterteilungYAchse.GetText
+    sTempMetricField(5) = FangenFangbereich.GetText
+    sTempMetricField(6) = Punktreduktion.GetText
 
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -557,205 +554,203 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
     ToolsOptions
     hToolsOptions (sApplication,"Grid")
 
-      If ( irgendwas(1) = FangrasterBenutzen.IsChecked      ) Then WarnLog "Snap to Grid state changed"
-      If ( irgendwas(2) = RasterSichtbar.IsChecked          ) Then WarnLog "Visible Grid state changed"
-
-'      If ( irgendwas(3) = AchsenSynchronisieren.IsChecked   ) Then WarnLog "Synchronize Axes state changed"
-      if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "Synchronize Axes state changed"
-
-      If ( irgendwas(4) = AnFanglinien.IsChecked            ) Then WarnLog "To snap lines state changed"
-      If ( irgendwas(5) = AnSeitenraendern.IsChecked        ) Then WarnLog "To the page margins state changed"
-      If ( irgendwas(6) = AmObjektrahmen.IsChecked          ) Then WarnLog "To object frame state changed"
-      If ( irgendwas(7) = AnObjektpunkten.IsChecked         ) Then WarnLog "To object points state changed"
-
-      If ( irgendwas(8) = BeimErzeugenUndBewegen.IsChecked  ) Then WarnLog "When creating or moving objects state changed"
-      If ( irgendwas(9) = LaengereKantenlaenge.IsChecked    ) Then WarnLog "Extend Edges state changed"
-      If ( irgendwas(10)= BeimDrehen.IsChecked              ) Then WarnLog "When Rotating state changed"
-
-      If ( RasterAufloesungXAchse.GetText <>   sTempMetricField(1) ) Then WarnLog "GridResolutionXAxel state changed"
-      If ( RasterAufloesungYAchse.GetText <>   sTempMetricField(2) ) Then WarnLog "GridResolutionYAxel state changed"
-      If ( RasterUnterteilungXAchse.GetText <> sTempMetricField(3) ) Then WarnLog "GridSubdivisionXAxel state changed is: "+RasterUnterteilungXAchse.GetText+"; should: "+sTempMetricField(3)
-      If ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) Then WarnLog "GridSubdivisionYAxel state changed is: "+RasterUnterteilungYAchse.GetText+"; should: "+sTempMetricField(4)
-      If ( FangenFangbereich.GetText <> sTempMetricField(5) ) Then WarnLog "SnapSnap range state changed"
-      If ( Punktreduktion.GetText <> sTempMetricField(6) ) Then WarnLog "Pointreduction state changed"
-
-  printlog "all UnCheck -> o"
-
-      FangrasterBenutzen.UnCheck
-      RasterSichtbar.UnCheck
-
-      AchsenSynchronisieren.UnCheck
-
-      AnFanglinien.UnCheck
-      AnSeitenraendern.UnCheck
-      AmObjektrahmen.UnCheck
-      AnObjektpunkten.UnCheck
-
-      BeimErzeugenUndBewegen.UnCheck
-      LaengereKantenlaenge.UnCheck
-      BeimDrehen.UnCheck
-
-      RasterAufloesungXAchse.ToMin
-      RasterAufloesungYAchse.ToMin
-      RasterUnterteilungXAchse.ToMin
-      RasterUnterteilungYAchse.ToMin
-      FangenFangbereich.ToMin
-      Punktreduktion.ToMin
-      sTempMetricField(1) = RasterAufloesungXAchse.GetText
-      sTempMetricField(2) = RasterAufloesungYAchse.GetText
-      sTempMetricField(3) = RasterUnterteilungXAchse.GetText
-      sTempMetricField(4) = RasterUnterteilungYAchse.GetText
-      sTempMetricField(5) = FangenFangbereich.GetText
-      sTempMetricField(6) = Punktreduktion.GetText
-     printlog "More test"
-      RasterAufloesungXAchse.More
-      RasterAufloesungYAchse.More
-      RasterUnterteilungXAchse.More
-      RasterUnterteilungYAchse.More
-      FangenFangbereich.More
-      Punktreduktion.More
-      if ( sTempMetricField(1) = RasterAufloesungXAchse.GetText   ) Then WarnLog "GridResolutionXAxel More-Button not working"
-      if ( sTempMetricField(2) = RasterAufloesungYAchse.GetText   ) Then WarnLog "GridResolutionYAxel More-Button not working"
-      if ( sTempMetricField(3) = RasterUnterteilungXAchse.GetText ) Then WarnLog "GridSubdivisionXAxel  More-Button not working"
-      if ( sTempMetricField(4) = RasterUnterteilungYAchse.GetText ) Then WarnLog "GridSubdivisionYAxel  More-Button not working"
-      if ( sTempMetricField(5) = FangenFangbereich.GetText ) Then WarnLog "Snap Snap Range More-Button not working"
-      if ( sTempMetricField(6) = Punktreduktion.GetText ) Then WarnLog "Pointreduction    More-Button not working is: "+Punktreduktion.GetText
-      sTempMetricField(1) = RasterAufloesungXAchse.GetText
-      sTempMetricField(2) = RasterAufloesungYAchse.GetText
-      sTempMetricField(3) = RasterUnterteilungXAchse.GetText
-      sTempMetricField(4) = RasterUnterteilungYAchse.GetText
-      sTempMetricField(5) = FangenFangbereich.GetText
-      sTempMetricField(6) = Punktreduktion.GetText
+    If ( irgendwas(1) = FangrasterBenutzen.IsChecked      ) Then WarnLog "Snap to Grid state changed"
+    If ( irgendwas(2) = RasterSichtbar.IsChecked          ) Then WarnLog "Visible Grid state changed"
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    '      If ( irgendwas(3) = AchsenSynchronisieren.IsChecked   ) Then WarnLog "Synchronize Axes state changed"
+    if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "Synchronize Axes state changed"
+
+    If ( irgendwas(4) = AnFanglinien.IsChecked            ) Then WarnLog "To snap lines state changed"
+    If ( irgendwas(5) = AnSeitenraendern.IsChecked        ) Then WarnLog "To the page margins state changed"
+    If ( irgendwas(6) = AmObjektrahmen.IsChecked          ) Then WarnLog "To object frame state changed"
+    If ( irgendwas(7) = AnObjektpunkten.IsChecked         ) Then WarnLog "To object points state changed"
+
+    If ( irgendwas(8) = BeimErzeugenUndBewegen.IsChecked  ) Then WarnLog "When creating or moving objects state changed"
+    If ( irgendwas(9) = LaengereKantenlaenge.IsChecked    ) Then WarnLog "Extend Edges state changed"
+    If ( irgendwas(10)= BeimDrehen.IsChecked              ) Then WarnLog "When Rotating state changed"
+
+    If ( RasterAufloesungXAchse.GetText <>   sTempMetricField(1) ) Then WarnLog "GridResolutionXAxel state changed"
+    If ( RasterAufloesungYAchse.GetText <>   sTempMetricField(2) ) Then WarnLog "GridResolutionYAxel state changed"
+    If ( RasterUnterteilungXAchse.GetText <> sTempMetricField(3) ) Then WarnLog "GridSubdivisionXAxel state changed is: "+RasterUnterteilungXAchse.GetText+"; should: "+sTempMetricField(3)
+    If ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) Then WarnLog "GridSubdivisionYAxel state changed is: "+RasterUnterteilungYAchse.GetText+"; should: "+sTempMetricField(4)
+    If ( FangenFangbereich.GetText <> sTempMetricField(5) ) Then WarnLog "SnapSnap range state changed"
+    If ( Punktreduktion.GetText <> sTempMetricField(6) ) Then WarnLog "Pointreduction state changed"
+
+    printlog "all UnCheck -> o"
+
+    FangrasterBenutzen.UnCheck
+    RasterSichtbar.UnCheck
+
+    AchsenSynchronisieren.UnCheck
+
+    AnFanglinien.UnCheck
+    AnSeitenraendern.UnCheck
+    AmObjektrahmen.UnCheck
+    AnObjektpunkten.UnCheck
+
+    BeimErzeugenUndBewegen.UnCheck
+    LaengereKantenlaenge.UnCheck
+    BeimDrehen.UnCheck
+
+    RasterAufloesungXAchse.ToMin
+    RasterAufloesungYAchse.ToMin
+    RasterUnterteilungXAchse.ToMin
+    RasterUnterteilungYAchse.ToMin
+    FangenFangbereich.ToMin
+    Punktreduktion.ToMin
+    sTempMetricField(1) = RasterAufloesungXAchse.GetText
+    sTempMetricField(2) = RasterAufloesungYAchse.GetText
+    sTempMetricField(3) = RasterUnterteilungXAchse.GetText
+    sTempMetricField(4) = RasterUnterteilungYAchse.GetText
+    sTempMetricField(5) = FangenFangbereich.GetText
+    sTempMetricField(6) = Punktreduktion.GetText
+    printlog "More test"
+    RasterAufloesungXAchse.More
+    RasterAufloesungYAchse.More
+    RasterUnterteilungXAchse.More
+    RasterUnterteilungYAchse.More
+    FangenFangbereich.More
+    Punktreduktion.More
+    if ( sTempMetricField(1) = RasterAufloesungXAchse.GetText   ) Then WarnLog "GridResolutionXAxel More-Button not working"
+    if ( sTempMetricField(2) = RasterAufloesungYAchse.GetText   ) Then WarnLog "GridResolutionYAxel More-Button not working"
+    if ( sTempMetricField(3) = RasterUnterteilungXAchse.GetText ) Then WarnLog "GridSubdivisionXAxel  More-Button not working"
+    if ( sTempMetricField(4) = RasterUnterteilungYAchse.GetText ) Then WarnLog "GridSubdivisionYAxel  More-Button not working"
+    if ( sTempMetricField(5) = FangenFangbereich.GetText ) Then WarnLog "Snap Snap Range More-Button not working"
+    if ( sTempMetricField(6) = Punktreduktion.GetText ) Then WarnLog "Pointreduction    More-Button not working is: "+Punktreduktion.GetText
+    sTempMetricField(1) = RasterAufloesungXAchse.GetText
+    sTempMetricField(2) = RasterAufloesungYAchse.GetText
+    sTempMetricField(3) = RasterUnterteilungXAchse.GetText
+    sTempMetricField(4) = RasterUnterteilungYAchse.GetText
+    sTempMetricField(5) = FangenFangbereich.GetText
+    sTempMetricField(6) = Punktreduktion.GetText
+
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-  printlog "check if all UnChecked"
-   ToolsOptions
-   hToolsOptions (sApplication,"Grid")
+    printlog "check if all UnChecked"
+    ToolsOptions
+    hToolsOptions (sApplication,"Grid")
 
-      If FangrasterBenutzen.IsChecked     Then WarnLog "Snap to Grid x"
-      If RasterSichtbar.IsChecked         Then WarnLog "Visible Grid x"
+    If FangrasterBenutzen.IsChecked     Then WarnLog "Snap to Grid x"
+    If RasterSichtbar.IsChecked         Then WarnLog "Visible Grid x"
 
-      If AchsenSynchronisieren.IsChecked  Then WarnLog "Synchronize Axes x"
+    If AchsenSynchronisieren.IsChecked  Then WarnLog "Synchronize Axes x"
 
-      If AnFanglinien.IsChecked           Then WarnLog "To Snap Lines x"
-      If AnSeitenraendern.IsChecked       Then WarnLog "To The Page Margins x"
-      If AmObjektrahmen.IsChecked         Then WarnLog "To Object Frame x"
-      If AnObjektpunkten.IsChecked        Then WarnLog "To Object Points x"
+    If AnFanglinien.IsChecked           Then WarnLog "To Snap Lines x"
+    If AnSeitenraendern.IsChecked       Then WarnLog "To The Page Margins x"
+    If AmObjektrahmen.IsChecked         Then WarnLog "To Object Frame x"
+    If AnObjektpunkten.IsChecked        Then WarnLog "To Object Points x"
 
-      If BeimErzeugenUndBewegen.IsChecked Then WarnLog "When Creating or Moving Objects x"
-      If LaengereKantenlaenge.IsChecked   Then WarnLog "Extend Edges x"
-      If BeimDrehen.IsChecked             Then WarnLog "When Rotating x"
+    If BeimErzeugenUndBewegen.IsChecked Then WarnLog "When Creating or Moving Objects x"
+    If LaengereKantenlaenge.IsChecked   Then WarnLog "Extend Edges x"
+    If BeimDrehen.IsChecked             Then WarnLog "When Rotating x"
 
-      If ( RasterAufloesungXAchse.GetText <>   sTempMetricField(1) ) Then WarnLog "GridResolutionXAxel  is not min."
-      If ( RasterAufloesungYAchse.GetText <>   sTempMetricField(2) ) Then WarnLog "GridResolutionYAxel  is not min."
-      If ( RasterUnterteilungXAchse.GetText <> sTempMetricField(3) ) Then WarnLog "GridSubdivisionXAxel  is not min."
-      If ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) Then WarnLog "GridSubdivisionYAxel  is not min."
-      If ( FangenFangbereich.GetText <> sTempMetricField(5) ) Then WarnLog "Snap Snap Range  is not min."
-      If ( Punktreduktion.GetText <> sTempMetricField(6) ) Then WarnLog "Point Reduction  is not min."
+    If ( RasterAufloesungXAchse.GetText <>   sTempMetricField(1) ) Then WarnLog "GridResolutionXAxel  is not min."
+    If ( RasterAufloesungYAchse.GetText <>   sTempMetricField(2) ) Then WarnLog "GridResolutionYAxel  is not min."
+    If ( RasterUnterteilungXAchse.GetText <> sTempMetricField(3) ) Then WarnLog "GridSubdivisionXAxel  is not min."
+    If ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) Then WarnLog "GridSubdivisionYAxel  is not min."
+    If ( FangenFangbereich.GetText <> sTempMetricField(5) ) Then WarnLog "Snap Snap Range  is not min."
+    If ( Punktreduktion.GetText <> sTempMetricField(6) ) Then WarnLog "Point Reduction  is not min."
 
-     Printlog "all Check -> x"
+    Printlog "all Check -> x"
 
-      FangrasterBenutzen.Check
-      RasterSichtbar.Check
+    FangrasterBenutzen.Check
+    RasterSichtbar.Check
 
-      AchsenSynchronisieren.Check
+    AchsenSynchronisieren.Check
 
     printlog "Synchronize axes check"
-   RasterAufloesungXAchse.ToMax
-   sleep 1
-      sTempMetricField(1) = RasterAufloesungXAchse.GetText
-   if RasterAufloesungYAchse.GetText <> sTempMetricField(1) then Warnlog "Y-axis res. differs from X-axis"
-   RasterUnterteilungXAchse.ToMax
-   sleep 1
-      sTempMetricField(3) = RasterUnterteilungXAchse.GetText
-   if RasterUnterteilungYAchse.GetText <> sTempMetricField(3) then Warnlog "Y-axis sub. differs from X-axis"
-'--------------------------------------------
-      sTempMetricField(2) = RasterAufloesungYAchse.GetText
-      sTempMetricField(4) = RasterUnterteilungYAchse.GetText
-
-      FangenFangbereich.Less
-      Punktreduktion.Less
-      sTempMetricField(5) = FangenFangbereich.GetText
-      sTempMetricField(6) = Punktreduktion.GetText
-
-      AnFanglinien.Check
-      AnSeitenraendern.Check
-      AmObjektrahmen.Check
-      AnObjektpunkten.Check
-
-      BeimErzeugenUndBewegen.Check
-      LaengereKantenlaenge.Check
-      BeimDrehen.Check
-         Winkel.ToMax
-         sTempMetricField(7) = Winkel.GetText
+    RasterAufloesungXAchse.ToMax
+    sleep 1
+    sTempMetricField(1) = RasterAufloesungXAchse.GetText
+    if RasterAufloesungYAchse.GetText <> sTempMetricField(1) then Warnlog "Y-axis res. differs from X-axis"
+    RasterUnterteilungXAchse.ToMax
+    sleep 1
+    sTempMetricField(3) = RasterUnterteilungXAchse.GetText
+    if RasterUnterteilungYAchse.GetText <> sTempMetricField(3) then Warnlog "Y-axis sub. differs from X-axis"
+    '--------------------------------------------
+    sTempMetricField(2) = RasterAufloesungYAchse.GetText
+    sTempMetricField(4) = RasterUnterteilungYAchse.GetText
+
+    FangenFangbereich.Less
+    Punktreduktion.Less
+    sTempMetricField(5) = FangenFangbereich.GetText
+    sTempMetricField(6) = Punktreduktion.GetText
+
+    AnFanglinien.Check
+    AnSeitenraendern.Check
+    AmObjektrahmen.Check
+    AnObjektpunkten.Check
+
+    BeimErzeugenUndBewegen.Check
+    LaengereKantenlaenge.Check
+    BeimDrehen.Check
+    Winkel.ToMax
+    sTempMetricField(7) = Winkel.GetText
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-  printlog "check if all Checked"
-   ToolsOptions
-   hToolsOptions (sApplication,"Grid")
+    printlog "check if all Checked"
+    ToolsOptions
+    hToolsOptions (sApplication,"Grid")
 
-      If True <> FangrasterBenutzen.IsChecked     Then WarnLog "Snap to Grid o"
-      If True <> RasterSichtbar.IsChecked         Then WarnLog "Visible Grid o"
+    If True <> FangrasterBenutzen.IsChecked     Then WarnLog "Snap to Grid o"
+    If True <> RasterSichtbar.IsChecked         Then WarnLog "Visible Grid o"
 
-      If True <> AchsenSynchronisieren.IsChecked  Then WarnLog "Synchronize Axes o"
+    If True <> AchsenSynchronisieren.IsChecked  Then WarnLog "Synchronize Axes o"
 
-      If True <> AnFanglinien.IsChecked           Then WarnLog "to snap lines o"
-      If True <> AnSeitenraendern.IsChecked       Then WarnLog "to the page margins o"
-      If True <> AmObjektrahmen.IsChecked         Then WarnLog "to object frame o"
-      If True <> AnObjektpunkten.IsChecked        Then WarnLog "To object points o"
+    If True <> AnFanglinien.IsChecked           Then WarnLog "to snap lines o"
+    If True <> AnSeitenraendern.IsChecked       Then WarnLog "to the page margins o"
+    If True <> AmObjektrahmen.IsChecked         Then WarnLog "to object frame o"
+    If True <> AnObjektpunkten.IsChecked        Then WarnLog "To object points o"
 
-      If True <> BeimErzeugenUndBewegen.IsChecked Then WarnLog "When creating or moving objects o"
-      If True <> LaengereKantenlaenge.IsChecked   Then WarnLog "Extend Edges o"
-      If True <> BeimDrehen.IsChecked             Then WarnLog "When Rotating o"
-         If ( Winkel.GetText <> sTempMetricField(7) ) Then WarnLog "Angle    is not max."
+    If True <> BeimErzeugenUndBewegen.IsChecked Then WarnLog "When creating or moving objects o"
+    If True <> LaengereKantenlaenge.IsChecked   Then WarnLog "Extend Edges o"
+    If True <> BeimDrehen.IsChecked             Then WarnLog "When Rotating o"
+     If ( Winkel.GetText <> sTempMetricField(7) ) Then WarnLog "Angle    is not max."
 
-      If ( RasterAufloesungXAchse.GetText <>   sTempMetricField(1) ) Then WarnLog "GridResolutionXAxel  is not max.Bug 54934 in 01:"
-      If ( RasterAufloesungYAchse.GetText <>   sTempMetricField(2) ) Then WarnLog "GridResolutionYAxel  is not max."
-      If ( RasterUnterteilungXAchse.GetText <> sTempMetricField(3) ) Then WarnLog "GridSubdivisionXAxel  is not max."
-      If ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) Then WarnLog "GridSubdivisionYAxel  is not max."
-      If ( FangenFangbereich.GetText <> sTempMetricField(5) ) Then WarnLog "Snap Snap Range  is not max."
-      If ( Punktreduktion.GetText <> sTempMetricField(6) ) Then WarnLog "Pointreduction  is not max."
+    If ( RasterAufloesungXAchse.GetText <>   sTempMetricField(1) ) Then WarnLog "GridResolutionXAxel  is not max.Bug 54934 in 01:"
+    If ( RasterAufloesungYAchse.GetText <>   sTempMetricField(2) ) Then WarnLog "GridResolutionYAxel  is not max."
+    If ( RasterUnterteilungXAchse.GetText <> sTempMetricField(3) ) Then WarnLog "GridSubdivisionXAxel  is not max."
+    If ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) Then WarnLog "GridSubdivisionYAxel  is not max."
+    If ( FangenFangbereich.GetText <> sTempMetricField(5) ) Then WarnLog "Snap Snap Range  is not max."
+    If ( Punktreduktion.GetText <> sTempMetricField(6) ) Then WarnLog "Pointreduction  is not max."
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
 '-------------------------------------------------------------------------------
     printlog "Function Test: Grid Resolution"
-    printlog "gTesttoolPath + graphics\required\input\gridtst.od?" 
-
-    if ( gApplication = "IMPRESS" ) then 
+    printlog "gTesttoolPath + graphics\required\input\gridtst.od?"
+    if ( gApplication = "IMPRESS" ) then
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
 
-
-   Call hFileOpen ( gTesttoolPath + "graphics\required\input\gridtst."+ExtensionString, False )
-   sleep 5
-   printlog "If write-protected - open as Temp-file"
-   Kontext "Standardbar"
-   if Bearbeiten.GetState(2) <> 1 then
+    Call hFileOpen ( gTesttoolPath + "graphics\required\input\gridtst."+ExtensionString, False )
+    sleep 5
+    printlog "If write-protected - open as Temp-file"
+    Kontext "Standardbar"
+    if Bearbeiten.GetState(2) <> 1 then
       Bearbeiten.Click '0 = not pressed. 1 = pressed.
       Kontext
       if Active.Exists() then
-      	 Active.Yes
+         Active.Yes
       else
          warnlog "No messagebox after making document editable? - Test canceled here"
          goto endsub
       endif
-   endif
-   sleep (8)
-   if uCase(gApplication) = "IMPRESS" then
+    endif
+    sleep (8)
+    if uCase(gApplication) = "IMPRESS" then
       Kontext "DocumentImpress"
-   else
+    else
       Kontext "DocumentDraw"
-   endif
-   printlog "select grafik element"
-   for iTry = 1 to 20 
+    endif
+    printlog "select grafik element"
+    for iTry = 1 to 20
         try
             EditSelectAll
             printlog "EditSelectAll ready after " & iTry/10 & " seconds"
@@ -769,21 +764,21 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
     ContextPositionAndSize
     Kontext
     active.setpage TabPositionAndSize
-       Kontext "TabPositionAndSize"
-       sleep 1
-       if ( StrToDouble (PositionX.GetText) <> 0 ) Then WarnLog "HorizontalBy wrong presupposition != 0"
-       if ( StrToDouble (Positiony.GetText) <> 0 ) Then WarnLog   "VerticalBy   wrong presupposition != 0"
-   TabPositionAndSize.Cancel
-   sleep (3)
-
-   printlog "move grafik with <Alt> + <up/down>"
+    Kontext "TabPositionAndSize"
+    sleep 1
+    if ( StrToDouble (PositionX.GetText) <> 0 ) Then WarnLog "HorizontalBy wrong presupposition != 0"
+    if ( StrToDouble (Positiony.GetText) <> 0 ) Then WarnLog   "VerticalBy   wrong presupposition != 0"
+    TabPositionAndSize.Cancel
+    sleep (3)
+
+    printlog "move grafik with <Alt> + <up/down>"
     printlog "resulting step = defined for accessability <> one pixel with cursor traveling"
-   hTypeKeys "<Mod2 Down>"
+    hTypeKeys "<Mod2 Down>"
     sleep (3)
-   hTypeKeys "<Mod2 Right>"
+    hTypeKeys "<Mod2 Right>"
 
-   printlog "check if @ (1,1) Current-Measure-Unit :-)"
-   for iTry = 1 to 20 
+    printlog "check if @ (1,1) Current-Measure-Unit :-)"
+    for iTry = 1 to 20
         try
             EditSelectAll
             printlog "EditSelectAll ready after " & iTry/10 & " seconds"
@@ -792,18 +787,18 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
             wait( 100 )
         endcatch
     next iTry
-   try
+    try
       ContextPositionAndSize
-   catch
+    catch
       printlog "Why is format position and size not enabled ? Wrong focus?"
-   endcatch
+    endcatch
     Kontext
     active.setpage TabPositionAndSize
-       Kontext "TabPositionAndSize"
-         Printlog "X difference is: '"+StrToDouble (PositionX.GetText)+"'; "+PositionX.GetText
-         Printlog "Y difference is: '"+StrToDouble (PositionY.GetText)+"'; "+PositionY.GetText
-   TabPositionAndSize.Cancel
-'   sleep (3)
+    Kontext "TabPositionAndSize"
+    Printlog "X difference is: '"+StrToDouble (PositionX.GetText)+"'; "+PositionX.GetText
+    Printlog "Y difference is: '"+StrToDouble (PositionY.GetText)+"'; "+PositionY.GetText
+    TabPositionAndSize.Cancel
+    '   sleep (3)
 
    hCloseDocument
 
@@ -813,27 +808,27 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
     ToolsOptions
     hToolsOptions (sApplication,"Grid")
 
-        If ( irgendwas(2) = TRUE ) Then  FangrasterBenutzen.Check      Else FangrasterBenutzen.UnCheck
-        If ( irgendwas(3) = TRUE ) Then  RasterSichtbar.Check          Else RasterSichtbar.UnCheck
-        
-        If ( irgendwas(4) = TRUE ) Then  AchsenSynchronisieren.Check   Else AchsenSynchronisieren.UnCheck
-        
-        If ( irgendwas(5) = TRUE ) Then  AnFanglinien.Check            Else AnFanglinien.UnCheck
-        If ( irgendwas(6) = TRUE ) Then  AnSeitenraendern.Check        Else AnSeitenraendern.UnCheck
-        If ( irgendwas(7) = TRUE ) Then  AmObjektrahmen.Check          Else AmObjektrahmen.UnCheck
-        If ( irgendwas(8) = TRUE ) Then  AnObjektpunkten.Check         Else AnObjektpunkten.UnCheck
-        
-        If ( irgendwas(6) = TRUE ) Then  BeimErzeugenUndBewegen.Check  Else BeimErzeugenUndBewegen.UnCheck
-        If ( irgendwas(7) = TRUE ) Then  LaengereKantenlaenge.Check    Else LaengereKantenlaenge.UnCheck
-        If ( irgendwas(8) = TRUE ) Then  BeimDrehen.Check              Else BeimDrehen.UnCheck
-        if BeimDrehen.IsChecked then Winkel.SetText (sMetricField(7))
-        
-        RasterAufloesungXAchse.SetText   (sMetricField(1))
-        RasterAufloesungYAchse.SetText   (sMetricField(2))
-        RasterUnterteilungXAchse.SetText (sMetricField(3))
-        RasterUnterteilungYAchse.SetText (sMetricField(4))
-        FangenFangbereich.SetText (sMetricField(5))
-        Punktreduktion.SetText (sMetricField(6))
+    If ( irgendwas(2) = TRUE ) Then  FangrasterBenutzen.Check      Else FangrasterBenutzen.UnCheck
+    If ( irgendwas(3) = TRUE ) Then  RasterSichtbar.Check          Else RasterSichtbar.UnCheck
+
+    If ( irgendwas(4) = TRUE ) Then  AchsenSynchronisieren.Check   Else AchsenSynchronisieren.UnCheck
+
+    If ( irgendwas(5) = TRUE ) Then  AnFanglinien.Check            Else AnFanglinien.UnCheck
+    If ( irgendwas(6) = TRUE ) Then  AnSeitenraendern.Check        Else AnSeitenraendern.UnCheck
+    If ( irgendwas(7) = TRUE ) Then  AmObjektrahmen.Check          Else AmObjektrahmen.UnCheck
+    If ( irgendwas(8) = TRUE ) Then  AnObjektpunkten.Check         Else AnObjektpunkten.UnCheck
+
+    If ( irgendwas(6) = TRUE ) Then  BeimErzeugenUndBewegen.Check  Else BeimErzeugenUndBewegen.UnCheck
+    If ( irgendwas(7) = TRUE ) Then  LaengereKantenlaenge.Check    Else LaengereKantenlaenge.UnCheck
+    If ( irgendwas(8) = TRUE ) Then  BeimDrehen.Check              Else BeimDrehen.UnCheck
+    if BeimDrehen.IsChecked then Winkel.SetText (sMetricField(7))
+
+    RasterAufloesungXAchse.SetText   (sMetricField(1))
+    RasterAufloesungYAchse.SetText   (sMetricField(2))
+    RasterUnterteilungXAchse.SetText (sMetricField(3))
+    RasterUnterteilungYAchse.SetText (sMetricField(4))
+    FangenFangbereich.SetText (sMetricField(5))
+    Punktreduktion.SetText (sMetricField(6))
 
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -845,58 +840,58 @@ endcase 'tToolsOptionsDrawGrid
 
 testcase tToolsOptionsDrawPrint (sApplication as string)
 
-   dim irgendwas(11) as boolean
-   dim bRadioBut(7) as boolean         ' RadioButtons
-   dim bTempRadioBut(7) as boolean
-   dim iShouldHaveBeenAMultiListBox as integer
+    dim irgendwas(11) as boolean
+    dim bRadioBut(7) as boolean         ' RadioButtons
+    dim bTempRadioBut(7) as boolean
+    dim iShouldHaveBeenAMultiListBox as integer
 
-   hNewDocument
+    hNewDocument
 
-  printlog "save states"
-   ToolsOptions
-   hToolsOptions (sApplication,"Print")
+    printlog "save states"
+    ToolsOptions
+    hToolsOptions (sApplication,"Print")
 
-      Standard.Check
-      irgendwas(1) = Seitenname.IsChecked
-      irgendwas(2) = Datum.IsChecked
-      irgendwas(3) = Zeit.IsChecked
-      irgendwas(4) = AusgeblendeteSeitenDrucken.IsChecked
+    Standard.Check
+    irgendwas(1) = Seitenname.IsChecked
+    irgendwas(2) = Datum.IsChecked
+    irgendwas(3) = Zeit.IsChecked
+    irgendwas(4) = AusgeblendeteSeitenDrucken.IsChecked
 
-      Prospekt.Check
-      irgendwas(5) = Vorderseite.IsChecked
-      irgendwas(6) = Rueckseite.IsChecked
+    Prospekt.Check
+    irgendwas(5) = Vorderseite.IsChecked
+    irgendwas(6) = Rueckseite.IsChecked
 
-      irgendwas(7) = AusDruckereinstellung.IsChecked
+    irgendwas(7) = AusDruckereinstellung.IsChecked
 
-      bRadioBut(1) = StandardAusgabe.IsChecked
-      bRadioBut(2) = Graustufen.IsChecked
-      bRadioBut(3) = SchwarzWeiss.IsChecked
-      bRadioBut(4) = Standard.IsChecked
-      bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
-      bRadioBut(6) = SeitenKacheln.IsChecked
+    bRadioBut(1) = StandardAusgabe.IsChecked
+    bRadioBut(2) = Graustufen.IsChecked
+    bRadioBut(3) = SchwarzWeiss.IsChecked
+    bRadioBut(4) = Standard.IsChecked
+    bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
+    bRadioBut(6) = SeitenKacheln.IsChecked
 
-     printlog "all states inverting"
+    printlog "all states inverting"
 
-      Standard.Check
-      if irgendwas(1) Then Seitenname.UnCheck            Else Seitenname.Check
-      if irgendwas(2) Then Datum.UnCheck                 Else Datum.Check
-      if irgendwas(3) Then Zeit.UnCheck                  Else Zeit.Check
-      if irgendwas(4) Then AusgeblendeteSeitenDrucken.UnCheck   Else AusgeblendeteSeitenDrucken.Check
+    Standard.Check
+    if irgendwas(1) Then Seitenname.UnCheck            Else Seitenname.Check
+    if irgendwas(2) Then Datum.UnCheck                 Else Datum.Check
+    if irgendwas(3) Then Zeit.UnCheck                  Else Zeit.Check
+    if irgendwas(4) Then AusgeblendeteSeitenDrucken.UnCheck   Else AusgeblendeteSeitenDrucken.Check
 
-      Prospekt.Check
-      if irgendwas(5) Then Vorderseite.UnCheck           Else Vorderseite.Check
-      if irgendwas(6) Then Rueckseite.UnCheck            Else Rueckseite.Check
+    Prospekt.Check
+    if irgendwas(5) Then Vorderseite.UnCheck           Else Vorderseite.Check
+    if irgendwas(6) Then Rueckseite.UnCheck            Else Rueckseite.Check
 
-      if irgendwas(7) Then AusDruckereinstellung.UnCheck Else AusDruckereinstellung.Check
+    if irgendwas(7) Then AusDruckereinstellung.UnCheck Else AusDruckereinstellung.Check
 
-      if (StandardAusgabe.IsChecked = True) Then Graustufen.Check Else StandardAusgabe.Check
-      bTempRadioBut(1) = StandardAusgabe.IsChecked
-      bTempRadioBut(2) = Graustufen.IsChecked
-      bTempRadioBut(3) = SchwarzWeiss.IsChecked
-      if (Standard.IsChecked = True) Then AnSeitengroesseAnpassen.Check Else Standard.Check
-      bRadioBut(4) = Standard.IsChecked
-      bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
-      bRadioBut(6) = SeitenKacheln.IsChecked
+    if (StandardAusgabe.IsChecked = True) Then Graustufen.Check Else StandardAusgabe.Check
+    bTempRadioBut(1) = StandardAusgabe.IsChecked
+    bTempRadioBut(2) = Graustufen.IsChecked
+    bTempRadioBut(3) = SchwarzWeiss.IsChecked
+    if (Standard.IsChecked = True) Then AnSeitengroesseAnpassen.Check Else Standard.Check
+    bRadioBut(4) = Standard.IsChecked
+    bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
+    bRadioBut(6) = SeitenKacheln.IsChecked
 
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -910,145 +905,137 @@ testcase tToolsOptionsDrawPrint (sApplication as string)
     ToolsOptions
     hToolsOptions (sApplication,"Print")
 
-      Standard.Check
-      If ( irgendwas(1) = Seitenname.IsChecked            ) Then WarnLog "Pagename  state changed"
-      If ( irgendwas(2) = Datum.IsChecked                 ) Then WarnLog "Date  state changed"
-      If ( irgendwas(3) = Zeit.IsChecked                  ) Then WarnLog "Time  state changed"
-      If ( irgendwas(4) = AusgeblendeteSeitenDrucken.IsChecked   ) Then WarnLog "Hidden Pages  state changed"
+    Standard.Check
+    If ( irgendwas(1) = Seitenname.IsChecked            ) Then WarnLog "Pagename  state changed"
+    If ( irgendwas(2) = Datum.IsChecked                 ) Then WarnLog "Date  state changed"
+    If ( irgendwas(3) = Zeit.IsChecked                  ) Then WarnLog "Time  state changed"
+    If ( irgendwas(4) = AusgeblendeteSeitenDrucken.IsChecked   ) Then WarnLog "Hidden Pages  state changed"
 
-      Prospekt.Check
-      If ( irgendwas(5) = Vorderseite.IsChecked           ) Then WarnLog "Brochure Front  state changed"
-      If ( irgendwas(6) = Rueckseite.IsChecked            ) Then WarnLog "Brochure Back  state changed"
+    Prospekt.Check
+    If ( irgendwas(5) = Vorderseite.IsChecked           ) Then WarnLog "Brochure Front  state changed"
+    If ( irgendwas(6) = Rueckseite.IsChecked            ) Then WarnLog "Brochure Back  state changed"
 
-      If ( irgendwas(7) = AusDruckereinstellung.IsChecked ) Then WarnLog "Paper Tray From Printer Settings  state changed"
+    If ( irgendwas(7) = AusDruckereinstellung.IsChecked ) Then WarnLog "Paper Tray From Printer Settings  state changed"
 
-      If ( bTempRadioBut(1) <> StandardAusgabe.IsChecked ) Then WarnLog "Quality Default  state changed"
-      If ( bTempRadioBut(2) <> Graustufen.IsChecked      ) Then WarnLog "Quality Grayscale  state changed"
-      If ( bTempRadioBut(3) <> SchwarzWeiss.IsChecked    ) Then WarnLog "Quality Black & White  state changed"
-      If ( bTempRadioBut(4) <> Standard.IsChecked                ) Then WarnLog "Page Options Default  state changed"
-      If ( bTempRadioBut(5) <> AnSeitengroesseAnpassen.IsChecked ) Then WarnLog "Page Options Fit to Page  state changed"
-      If ( bTempRadioBut(6) <> SeitenKacheln.IsChecked           ) Then WarnLog "Page Options Tile Pages state changed"
+    If ( bTempRadioBut(1) <> StandardAusgabe.IsChecked ) Then WarnLog "Quality Default  state changed"
+    If ( bTempRadioBut(2) <> Graustufen.IsChecked      ) Then WarnLog "Quality Grayscale  state changed"
+    If ( bTempRadioBut(3) <> SchwarzWeiss.IsChecked    ) Then WarnLog "Quality Black & White  state changed"
+    If ( bTempRadioBut(4) <> Standard.IsChecked                ) Then WarnLog "Page Options Default  state changed"
+    If ( bTempRadioBut(5) <> AnSeitengroesseAnpassen.IsChecked ) Then WarnLog "Page Options Fit to Page  state changed"
+    If ( bTempRadioBut(6) <> SeitenKacheln.IsChecked           ) Then WarnLog "Page Options Tile Pages state changed"
 
     printlog "all UnCheck -> o"
 
-      Standard.Check
-      Seitenname.UnCheck
-      Datum.UnCheck
-      Zeit.UnCheck
-      AusgeblendeteSeitenDrucken.UnCheck
-
-      Prospekt.Check
-      Vorderseite.UnCheck
-      Rueckseite.UnCheck
-
-      AusDruckereinstellung.UnCheck
-
-      if (Graustufen.IsChecked = True) Then SchwarzWeiss.Check Else Graustufen.Check
-      bTempRadioBut(1) = StandardAusgabe.IsChecked
-      bTempRadioBut(2) = Graustufen.IsChecked
-      bTempRadioBut(3) = SchwarzWeiss.IsChecked
-      if (AnSeitengroesseAnpassen.IsChecked = True) Then SeitenKacheln.Check Else AnSeitengroesseAnpassen.Check
-      bRadioBut(4) = Standard.IsChecked
-      bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
-      bRadioBut(6) = SeitenKacheln.IsChecked
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-  printlog "check if all UnChecked"
-   ToolsOptions
-   hToolsOptions (sApplication,"Print")
-
-      Standard.Check
-      If Seitenname.IsChecked            Then WarnLog "Print: Page Name  x"
-      If Datum.IsChecked                 Then WarnLog "Print: Date  x"
-      If Zeit.IsChecked                  Then WarnLog "Print: Time  x"
-      If AusgeblendeteSeitenDrucken.IsChecked   Then WarnLog "Print: Hidden Pages  x"
-
-      Prospekt.Check
-      If Vorderseite.IsChecked           Then WarnLog "Page options: Brochure: Front  x"
-      If Rueckseite.IsChecked            Then WarnLog "Page options: Brochure: Back  x"
+    Standard.Check
+    Seitenname.UnCheck
+    Datum.UnCheck
+    Zeit.UnCheck
+    AusgeblendeteSeitenDrucken.UnCheck
 
-      If AusDruckereinstellung.IsChecked Then WarnLog "Page options: Paper tray from printer settings  x"
+    Prospekt.Check
+    Vorderseite.UnCheck
+    Rueckseite.UnCheck
 
-      If ( bTempRadioBut(1) <> StandardAusgabe.IsChecked) Then WarnLog "Quality: Default  state changed"
-      If ( bTempRadioBut(2) <> Graustufen.IsChecked     ) Then WarnLog "Quality: Grayscale  state changed"
-      If ( bTempRadioBut(3) <> SchwarzWeiss.IsChecked   ) Then WarnLog "Quality: Black & White  state changed"
-      If ( bTempRadioBut(4) <> Standard.IsChecked                ) Then WarnLog "Page options: Default  state changed"
-      If ( bTempRadioBut(5) <> AnSeitengroesseAnpassen.IsChecked ) Then WarnLog "Page options: Fit to page  state changed"
-      If ( bTempRadioBut(6) <> SeitenKacheln.IsChecked           ) Then WarnLog "Page options: Tile Pages  state changed"
+    AusDruckereinstellung.UnCheck
 
-     Printlog "all Check -> x"
+    if (Graustufen.IsChecked = True) Then SchwarzWeiss.Check Else Graustufen.Check
+    bTempRadioBut(1) = StandardAusgabe.IsChecked
+    bTempRadioBut(2) = Graustufen.IsChecked
+    bTempRadioBut(3) = SchwarzWeiss.IsChecked
+    if (AnSeitengroesseAnpassen.IsChecked = True) Then SeitenKacheln.Check Else AnSeitengroesseAnpassen.Check
+    bRadioBut(4) = Standard.IsChecked
+    bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
+    bRadioBut(6) = SeitenKacheln.IsChecked
 
-      Standard.Check
-      Seitenname.Check
-      Datum.Check
-      Zeit.Check
-      AusgeblendeteSeitenDrucken.Check
-
-      Prospekt.Check
-      Vorderseite.Check
-      Rueckseite.Check
-
-      AusDruckereinstellung.Check
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-      if (SchwarzWeiss.IsChecked = True) Then StandardAusgabe.Check Else SchwarzWeiss.Check
-      bTempRadioBut(1) = StandardAusgabe.IsChecked
-      bTempRadioBut(2) = Graustufen.IsChecked
-      bTempRadioBut(3) = SchwarzWeiss.IsChecked
-      if (SeitenKacheln.IsChecked = True) Then Standard.Check Else SeitenKacheln.Check
-      bRadioBut(4) = Standard.IsChecked
-      bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
-      bRadioBut(6) = SeitenKacheln.IsChecked
+    printlog "check if all UnChecked"
+    ToolsOptions
+    hToolsOptions (sApplication,"Print")
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Standard.Check
+    If Seitenname.IsChecked            Then WarnLog "Print: Page Name  x"
+    If Datum.IsChecked                 Then WarnLog "Print: Date  x"
+    If Zeit.IsChecked                  Then WarnLog "Print: Time  x"
+    If AusgeblendeteSeitenDrucken.IsChecked   Then WarnLog "Print: Hidden Pages  x"
+    Prospekt.Check
+    If Vorderseite.IsChecked           Then WarnLog "Page options: Brochure: Front  x"
+    If Rueckseite.IsChecked            Then WarnLog "Page options: Brochure: Back  x"
+    If AusDruckereinstellung.IsChecked Then WarnLog "Page options: Paper tray from printer settings  x"
+    If ( bTempRadioBut(1) <> StandardAusgabe.IsChecked) Then WarnLog "Quality: Default  state changed"
+    If ( bTempRadioBut(2) <> Graustufen.IsChecked     ) Then WarnLog "Quality: Grayscale  state changed"
+    If ( bTempRadioBut(3) <> SchwarzWeiss.IsChecked   ) Then WarnLog "Quality: Black & White  state changed"
+    If ( bTempRadioBut(4) <> Standard.IsChecked                ) Then WarnLog "Page options: Default  state changed"
+    If ( bTempRadioBut(5) <> AnSeitengroesseAnpassen.IsChecked ) Then WarnLog "Page options: Fit to page  state changed"
+    If ( bTempRadioBut(6) <> SeitenKacheln.IsChecked           ) Then WarnLog "Page options: Tile Pages  state changed"
+
+    Printlog "all Check -> x"
+    Standard.Check
+    Seitenname.Check
+    Datum.Check
+    Zeit.Check
+    AusgeblendeteSeitenDrucken.Check
+    Prospekt.Check
+    Vorderseite.Check
+    Rueckseite.Check
+    AusDruckereinstellung.Check
+    if (SchwarzWeiss.IsChecked = True) Then StandardAusgabe.Check Else SchwarzWeiss.Check
+    bTempRadioBut(1) = StandardAusgabe.IsChecked
+    bTempRadioBut(2) = Graustufen.IsChecked
+    bTempRadioBut(3) = SchwarzWeiss.IsChecked
+    if (SeitenKacheln.IsChecked = True) Then Standard.Check Else SeitenKacheln.Check
+    bRadioBut(4) = Standard.IsChecked
+    bRadioBut(5) = AnSeitengroesseAnpassen.IsChecked
+    bRadioBut(6) = SeitenKacheln.IsChecked
 
-  printlog "check if all Checked"
-   ToolsOptions
-   hToolsOptions (sApplication,"Print")
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
-      Standard.Check
-      If True <> Seitenname.IsChecked            Then WarnLog "Print: Page name  o"
-      If True <> Datum.IsChecked                 Then WarnLog "Print: Date  o"
-      If True <> Zeit.IsChecked                  Then WarnLog "Print: Time  o"
-      If True <> AusgeblendeteSeitenDrucken.IsChecked   Then WarnLog "Print: Hidden pages  o"
+    printlog "check if all Checked"
+    ToolsOptions
+    hToolsOptions (sApplication,"Print")
 
-      Prospekt.Check
-      If True <> Vorderseite.IsChecked           Then WarnLog "Page options: Brochure: Front  o"
-      If True <> Rueckseite.IsChecked            Then WarnLog "Page options: Brochure: Back  o"
+    Standard.Check
+    If True <> Seitenname.IsChecked            Then WarnLog "Print: Page name  o"
+    If True <> Datum.IsChecked                 Then WarnLog "Print: Date  o"
+    If True <> Zeit.IsChecked                  Then WarnLog "Print: Time  o"
+    If True <> AusgeblendeteSeitenDrucken.IsChecked   Then WarnLog "Print: Hidden pages  o"
 
-      If True <> AusDruckereinstellung.IsChecked Then WarnLog "Page options: Paper tray from printer settings  o"
+    Prospekt.Check
+    If True <> Vorderseite.IsChecked           Then WarnLog "Page options: Brochure: Front  o"
+    If True <> Rueckseite.IsChecked            Then WarnLog "Page options: Brochure: Back  o"
 
-      If ( bTempRadioBut(1) <> StandardAusgabe.IsChecked) Then WarnLog "Quality: Default  state changed"
-      If ( bTempRadioBut(2) <> Graustufen.IsChecked     ) Then WarnLog "Quality: Grayscale  state changed"
-      If ( bTempRadioBut(3) <> SchwarzWeiss.IsChecked   ) Then WarnLog "Quality: Black & White  state changed"
-      If ( bTempRadioBut(4) <> Standard.IsChecked                ) Then WarnLog "Page options: Default  state changed"
-      If ( bTempRadioBut(5) <> AnSeitengroesseAnpassen.IsChecked ) Then WarnLog "Page options: Fit to page  state changed"
-      If ( bTempRadioBut(6) <> SeitenKacheln.IsChecked           ) Then WarnLog "Page options: Tile pages  state changed"
+    If True <> AusDruckereinstellung.IsChecked Then WarnLog "Page options: Paper tray from printer settings  o"
 
-  printlog "restore states"
+    If ( bTempRadioBut(1) <> StandardAusgabe.IsChecked) Then WarnLog "Quality: Default  state changed"
+    If ( bTempRadioBut(2) <> Graustufen.IsChecked     ) Then WarnLog "Quality: Grayscale  state changed"
+    If ( bTempRadioBut(3) <> SchwarzWeiss.IsChecked   ) Then WarnLog "Quality: Black & White  state changed"
+    If ( bTempRadioBut(4) <> Standard.IsChecked                ) Then WarnLog "Page options: Default  state changed"
+    If ( bTempRadioBut(5) <> AnSeitengroesseAnpassen.IsChecked ) Then WarnLog "Page options: Fit to page  state changed"
+    If ( bTempRadioBut(6) <> SeitenKacheln.IsChecked           ) Then WarnLog "Page options: Tile pages  state changed"
 
-      Standard.Check
-      If ( irgendwas(1) = TRUE ) Then Seitenname.Check            Else Seitenname.UnCheck
-      If ( irgendwas(2) = TRUE ) Then Datum.Check                 Else Datum.UnCheck
-      If ( irgendwas(3) = TRUE ) Then Zeit.Check                  Else Zeit.UnCheck
-      If ( irgendwas(4) = TRUE ) Then AusgeblendeteSeitenDrucken.Check   Else AusgeblendeteSeitenDrucken.UnCheck
+    printlog "restore states"
 
-      Prospekt.Check
-      If ( irgendwas(5) = TRUE ) Then Vorderseite.Check           Else Vorderseite.UnCheck
-      If ( irgendwas(6) = TRUE ) Then Rueckseite.Check            Else Rueckseite.UnCheck
+    Standard.Check
+    If ( irgendwas(1) = TRUE ) Then Seitenname.Check            Else Seitenname.UnCheck
+    If ( irgendwas(2) = TRUE ) Then Datum.Check                 Else Datum.UnCheck
+    If ( irgendwas(3) = TRUE ) Then Zeit.Check                  Else Zeit.UnCheck
+    If ( irgendwas(4) = TRUE ) Then AusgeblendeteSeitenDrucken.Check   Else AusgeblendeteSeitenDrucken.UnCheck
 
-      If ( irgendwas(7) = TRUE ) Then AusDruckereinstellung.Check Else AusDruckereinstellung.UnCheck
+    Prospekt.Check
+    If ( irgendwas(5) = TRUE ) Then Vorderseite.Check           Else Vorderseite.UnCheck
+    If ( irgendwas(6) = TRUE ) Then Rueckseite.Check            Else Rueckseite.UnCheck
 
-      If ( bRadioBut(1) = TRUE ) Then StandardAusgabe.Check
-      If ( bRadioBut(2) = TRUE ) Then Graustufen.Check
-      If ( bRadioBut(3) = TRUE ) Then SchwarzWeiss.Check
-      Standard.Check
+    If ( irgendwas(7) = TRUE ) Then AusDruckereinstellung.Check Else AusDruckereinstellung.UnCheck
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    If ( bRadioBut(1) = TRUE ) Then StandardAusgabe.Check
+    If ( bRadioBut(2) = TRUE ) Then Graustufen.Check
+    If ( bRadioBut(3) = TRUE ) Then SchwarzWeiss.Check
+    Standard.Check
 
-   hCloseDocument
-endcase 'tToolsOptionsDrawPrint
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 
+    hCloseDocument
+endcase 'tToolsOptionsDrawPrint
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/global/id_opt_2.inc b/testautomation/graphics/required/includes/global/id_opt_2.inc
index 8d38b2b9dc92..0d2f050f4916 100644
--- a/testautomation/graphics/required/includes/global/id_opt_2.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_2.inc
@@ -37,15 +37,15 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string)
     dim iCount2 as integer
     dim sUnitOptions as string
     dim sUnitDialog as string
-   
+
     hNewDocument
-	sleep 1
+    sleep 1
     ToolsOptions
     hToolsOptions (sApplication,"General")
     iCount2 = Masseinheit.GetSelIndex
     printlog "current measurement unit is: " & iCount2
     iCount = Masseinheit.GetItemCount
-   
+
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
     printlog "----------------------"
@@ -56,14 +56,11 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string)
     for i=1 to iCount
         ToolsOptions
         hToolsOptions (sApplication,"General")
-
         Masseinheit.select i
         sUnitOptions = GetMeasUnit(Tabulatorabstand.getText)  ' (1)
         printlog "(" + i + "/" + iCount + "): '" + Masseinheit.getSelText + "' - " + sUnitOptions + "      (1)"
-
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
-
         Format3D_Effects
         Kontext "Drei_D_Effekte"
         Geometrie.Click
@@ -74,7 +71,6 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string)
              printlog "Measurement Unit is same for Options:'" + sUnitOptions + "' and Depth:'" + getMeasUnit(Tiefe.getText) + "'      (3)"
         endif
         Drei_D_Effekte.close
-
         FormatParagraph
         Kontext
         Messagebox.SetPage TabEinzuegeUndAbstaende
@@ -86,9 +82,8 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string)
              printlog "Measurement Unit is same for Options:'" + sUnitOptions + "' and Vonlinks:'" + getMeasUnit(Vonlinks.getText) + "' Paragraph"
         endif
         TabEinzuegeUndAbstaende.cancel
-
     next i
-    
+
     printlog "Setting back measurement to " & iCount2
     ToolsOptions
     hToolsOptions (sApplication,"General")
@@ -97,4 +92,4 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string)
     ExtrasOptionenDlg.OK
 
     hCloseDocument
-endcase 'tToolsOptionsMeasurementUnit 
+endcase 'tToolsOptionsMeasurementUnit 
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index 2674433034b9..4cdd6a595cc6 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -130,7 +130,9 @@ testcase tiViewPanes
     hMenuSelectNr (4)
 
 endcase 'tiViewPanes
+
 '---------------------------------------------------------
+
 testcase tiViewMasterView
     printlog "open application"
     Call hNewDocument
@@ -150,7 +152,9 @@ testcase tiViewMasterView
     printlog "close application "
     Call hCloseDocument
 endcase 'tiViewMasterView
+
 '---------------------------------------------------------
+
 testcase tiViewSlideMaster
 
     printlog "open application with : File->Autopilot->Presentation; OK; OK "
@@ -187,7 +191,9 @@ testcase tiViewSlideMaster
     Call  hCloseDocument
 
 endcase 'tiViewSlideMaster
+
 '--------------------------------------------------------
+
 testcase tiViewToolbar_1
 
     const DEFAULT_DELAY = 3
@@ -198,7 +204,6 @@ testcase tiViewToolbar_1
     dim i as integer
     
     TestFile = ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-
     printlog "open application "
     Call hNewDocument
 
@@ -209,10 +214,8 @@ testcase tiViewToolbar_1
     hUseAsyncSlot( "EditSelectAll" )
     Kontext "DocumentImpress"
     DocumentImpress.typeKeys("<DELETE>",true)
-
     printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
     hUseAsyncSlot( "InsertGraphicsFromFile" )
-
     Kontext "GrafikEinfuegenDlg"
     if ( GrafikEinfuegenDlg.exists( DEFAULT_DELAY ) ) then
         Dateiname.SetText( TestFile )
@@ -259,4 +262,4 @@ testcase tiViewToolbar_1
     printlog "close application "
     Call hCloseDocument
 
-endcase 'tiViewToolbar_1
+endcase 'tiViewToolbar_1
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/impress/im_005_.inc b/testautomation/graphics/required/includes/impress/im_005_.inc
index 146d37c0f669..f0703913e068 100644
--- a/testautomation/graphics/required/includes/impress/im_005_.inc
+++ b/testautomation/graphics/required/includes/impress/im_005_.inc
@@ -43,20 +43,16 @@ testcase tiFormatModifyLayout
 
     printlog "open application "
     Call  hNewDocument
-
     printlog( "Format/Page" )
     FormatPage
-
     Kontext "SeitenLayout"
     if ( SeitenLayout.exists( 2 ) ) then
         DialogTest ( SeitenLayout )
-
         printlog "cancel dialog 'Page Setup' "
         hCloseDialog( SeitenLayout, "Cancel" )
     else
         warnlog( "Dialog <SeitenLayout> did not open" )
     endif
-
     printlog "close application"
     Call hCloseDocument
 
diff --git a/testautomation/graphics/required/includes/impress/im_007_.inc b/testautomation/graphics/required/includes/impress/im_007_.inc
index 68d271e30d7f..3d6fcbb3f4f5 100644
--- a/testautomation/graphics/required/includes/impress/im_007_.inc
+++ b/testautomation/graphics/required/includes/impress/im_007_.inc
@@ -95,9 +95,10 @@ testcase tSlideShowSlideShow
     endcatch
     printlog "close application "
     Call hCloseDocument
-
 endcase 'tSlideShowSlideShow
+
 '-------------------------------------------------------------------------------
+
 testcase tSlideShowRehearseTimings
 
     goto endsub
@@ -139,11 +140,11 @@ testcase tSlideShowRehearseTimings
     sleep 3
     printlog "close application "
     Call hCloseDocument
-
 endcase 'tSlideShowRehearseTimings
+
 '-------------------------------------------------------------------------------
-testcase tSlideShowSlideShowSettings
 
+testcase tSlideShowSlideShowSettings
     printlog "open application "
     Call hNewDocument
     sleep 2
@@ -270,11 +271,11 @@ testcase tSlideShowCustomSlideShow
     endif
     printlog "close application "
     Call hCloseDocument
-
 endcase 'tSlideShowCustomSlideShow
+
 '------------------------------------------------------------------------------
-testcase tSlideShowSlideTransition
 
+testcase tSlideShowSlideTransition
     dim i as integer
     dim a as integer
     dim iCount as integer
@@ -326,7 +327,7 @@ testcase tSlideShowSlideTransition
     if (OeffnenDlg.exists (5)) then
         printlog "Read all entries in Listbox 'File type' "
         for i = 1 to Dateityp.getItemCount
-            printlog "" + i + ":" + Dateityp.getItemText(i)
+            printlog i + ":" + Dateityp.getItemText(i)
         next i
         printlog "cancel dialog 'Open' "
         OeffnenDlg.cancel
@@ -375,7 +376,9 @@ testcase tSlideShowSlideTransition
     Call hCloseDocument
 
 endcase 'tSlideShowSlideTransition
+
 '-------------------------------------------------------------------------------
+
 testcase tSlideShowShowHideSlide
 
     printlog "open application "
@@ -392,7 +395,9 @@ testcase tSlideShowShowHideSlide
     SlideShowShowSlide
     printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tSlideShowShowHideSlide
+
+'-------------------------------------------------------------------------------
 
 testcase tSlideShowAnimation
     printlog "open application "
@@ -478,9 +483,10 @@ testcase tSlideShowAnimation
     Call hCloseDocument
 
 endcase 'tSlideShowShowHideSlide
+
 '-------------------------------------------------------------------------------
-testcase tSlideShowCustomAnimation
 
+testcase tSlideShowCustomAnimation
     dim bError as boolean
 
     printlog "open application"
@@ -641,7 +647,9 @@ testcase tSlideShowCustomAnimation
     Call hCloseDocument
 
 endcase 'tSlideShowCustomAnimation
+
 '-------------------------------------------------------------------------------
+
 testcase tSlideShowInteraction
 
     printlog "open application "
@@ -732,4 +740,4 @@ testcase tSlideShowInteraction
     printlog "close application "
     Call hCloseDocument
 
-endcase 'tSlideShowInteraction
+endcase 'tSlideShowInteraction
\ No newline at end of file
diff --git a/testautomation/graphics/required/includes/impress/im_011_.inc b/testautomation/graphics/required/includes/impress/im_011_.inc
index 2c505f5facc2..28e58ee2e6e7 100644
--- a/testautomation/graphics/required/includes/impress/im_011_.inc
+++ b/testautomation/graphics/required/includes/impress/im_011_.inc
@@ -177,4 +177,4 @@ testcase tiDiaLeiste
     Call hCloseDocument
     sleep 2
 
-endcase 'tiDiaLeiste
+endcase 'tiDiaLeiste
\ No newline at end of file
diff --git a/testautomation/graphics/tools/makeLokaleTxt.bas b/testautomation/graphics/tools/makeLokaleTxt.bas
index 687822938dd7..59e66af87ff6 100755
--- a/testautomation/graphics/tools/makeLokaleTxt.bas
+++ b/testautomation/graphics/tools/makeLokaleTxt.bas
@@ -31,9 +31,9 @@
 '*
 '\******************************************************************
 
-'/// run this script, if you are testing a new language. ///'
-'/// it will add all relevant strings to the file qatesttool/graphics/tools/locale_1.txt ///'
-'/// you just have to make sure, that every language only appears once in the file! ///'
+printlog "Run this script, if you are testing a new language."
+printlog "it will add all relevant strings to the file qatesttool/graphics/tools/locale_1.txt "
+printlog "you just have to make sure, that every language only appears once in the file! "
 
 public glLocale (15*20) as string
 public S1 as string
@@ -54,13 +54,6 @@ sub main
         warnlog "Locales file doesn't exist: '" + gTesttoolPath + "graphics\tools\locale_1.txt'"
     endif
 
-    'Handouts
-    'Slide
-    'Default
-    'English (USA)
-    'Background
-    'German (Germany)
-
     printlog "Current saved strings are: "
     printlog "O 1: " + glLocale (1) 'Handouts        ' im_103.inc::tViewWorkspaceHandoutView
     printlog "O 2: " + glLocale (2) 'Slide           ' impress/slideshow.inc::
@@ -69,7 +62,7 @@ sub main
     printlog "O 5: " + glLocale (5) 'Background
     printlog "O 6: " + glLocale (6) 'German (Germany)
 
-    '/// LOCALE Slide - 2 ///'
+    printlog "LOCALE Slide - 2 "
     S1 = glLocale (2) + " 1"
     S2 = glLocale (2) + " 2"
     S3 = glLocale (2) + " 3"
@@ -83,14 +76,15 @@ sub main
     '   hMenuSelectNr(3)
     '   hMenuSelectNr(11)
     '   printlog hMenuItemGetText (4)
-    '  ViewWorkspaceHandoutView						'/// view background handout ///'
+    '   printlog "view background handout"
+    '  ViewWorkspaceHandoutView						
     '   sleep 2
     '  FormatPage
     sleep 2
     glLocale (1) = "Dummy" 'Seitenname.GetText
     Printlog "L1: '" + glLocale (1) + "'"
     '3  Seitenlayout.Close
-    '  ViewWorkspaceDrawingView						'/// back to view background drawing ///'
+    '  ViewWorkspaceDrawingView
 
     '(2)tSlideShowInteraction/fGetSlideName
     Kontext "Navigator"