CWS-TOOLING: integrate CWS qaerrorlogfixes1_DEV300

5 files changed, 231 insertions, 213 deletions

diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index ce652cffcc01..8e8484812b39 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -50,22 +50,22 @@
 '*
 '\******************************************************************************
 testcase tEPS
+    
+    dim x as integer
+    dim i as integer
+    dim sFilter as string
+    dim sExt as string
 
-   dim x as integer
-   dim i as integer
-   dim sFilter as string
-   dim sExt as string
-
-   sFilter = "EPS - Encapsulated PostScript (.eps)"
-   sExt = ".eps"
+    sFilter = "EPS - Encapsulated PostScript (.eps)"
+    sExt = ".eps"
 
-   '/// open the document
+    open the document
    hFileOpen ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
 
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "EPSOptionen"
       if EPSOptionen.Exists (2) then
-      '/// check if all properties have the right count, and depend on each other ///'
+      printlog "check if all properties have the right count, and depend on each other"
       ' they do not affect annything, i can check (TBO)
       ' VorschauTIF.Check
       '  InterchangeEPSI.Check
@@ -81,7 +81,7 @@ testcase tEPS
             if (LZWKodierung.IsEnabled <> TRUE) then warnlog " :-("
             if (Keine.IsEnabled <> TRUE) then warnlog " :-("
             ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-("
-         '/// 'Color Resolution' listbox contains eight items ///'
+         printlog "'Color Resolution' listbox contains eight items"
          ' x = TextEinstellungen.GetItemCount
          ' if x <> 2 then warnlog "'TextEinstellungen' Count is wrong; should:2, is:" + x
          ' for i = 1 to x
@@ -89,7 +89,7 @@ testcase tEPS
          ' sleep 1
          ' Printlog " - " + i + ": '" +TextEinstellungen.GetSelText + "'"
          ' next i
-         '/// leave dialog with cancel -> there has to be no file created! ///'
+         printlog "leave dialog with cancel -> there has to be no file created!"
          EPSOptionen.Cancel
          sleep 5
          if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
@@ -108,11 +108,11 @@ testcase tEPS
          Active.OK
       end if
    end if
-   Printlog "'/// now save it realy and load the file afterwards ///'"
+   printlog " now save it realy and load the file afterwards"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "EPSOptionen"
       if EPSOptionen.Exists (2) then
-      '  TextEinstellungen.select 2
+      printlog "TextEinstellungen.select 2"
          EPSOptionen.OK
          sleep 5
       endif
@@ -130,7 +130,7 @@ testcase tEPS
 
    call hCloseDocument
 
-endcase
+endcase 'tEPS
 '-------------------------------------------------------------------------
 testcase tPCT
 
@@ -150,24 +150,24 @@ testcase tPCT
    sFilter = "PCT - Mac Pict (.pct;.pict)"
    sExt = ".pct"
 
-   '/// open the document
+   printlog " open the document
    sDocument = ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
    hFileOpen sDocument
 
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PICTOptionen"
       if PICTOptionen.Exists (2) then
-      '/// check if all properties have the right count, and depend on each other ///'
+      printlog "check if all properties have the right count, and depend on each other"
          Original.Check
             if Breite.IsEnabled then warnlog " :-("
             if Hoehe.IsEnabled then warnlog " :-("
          Groesse.Check
             Breite.More
             Hoehe.Less
-         '/// leave dialog with cancel -> there has to be no file created! ///'
+         printlog "leave dialog with cancel -> there has to be no file created!"
          PICTOptionen.Cancel
          sleep 5
-         if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
+         if ( dir(OutputGrafikTBO+sExt) = "") then
             Printlog "Ok :-)"
          else
             warnlog "Dialog was canceled, but file got saved, too :-(  - i35177"
@@ -183,7 +183,7 @@ testcase tPCT
          Active.OK
       end if
    end if
-   Printlog "'/// now save it realy and load the file afterwards ///'"
+   printlog " now save it realy and load the file afterwards"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PICTOptionen"
       if PICTOptionen.Exists (2) then
@@ -214,13 +214,13 @@ testcase tPCT
       Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
    endif
    hCloseDocument ()
-   Printlog "'/// now save a SELECTION in ORIGINAL SIZE and load the file afterwards ///'"
+   printlog " now save a SELECTION in ORIGINAL SIZE and load the file afterwards"
    hFileOpen (sDocument)
    sleep (10)
 
-    ' check if the document is writable
+    printlog "check if the document is writable"
     if fIsDocumentWritable = false then
-        ' make the document writable and check if it's succesfull
+        printlog "make the document writable and check if it's succesfull"
         if fMakeDocumentWritable = false then
             warnlog "The document can't be make writeable. Test stopped."
             goto endsub
@@ -262,7 +262,7 @@ testcase tPCT
       endif
    endif
    hCloseDocument ()
-   Printlog "'/// now CREATE a rectangle, select it, save it in SIZE and load the file afterwards ///'"
+   printlog " now CREATE a rectangle, select it, save it in SIZE and load the file afterwards"
    hNewDocument()
    hRechteckErstellen ( 10, 10, 30, 40 )
    if hCallExport (OutputGrafikTBO + "2" , sFilter, TRUE ) = TRUE then
@@ -271,7 +271,8 @@ testcase tPCT
          Groesse.Check
             Breite.SetText "9"
             Hoehe.SetText "9"
-            Groesse.Check 'Check "Size" one more time to make the change go through"
+            Groesse.Check 
+            printlog "Check 'Size' one more time to make the change go through"
             sx1 = Breite.GetText
             sY = Hoehe.GetText
          PICTOptionen.OK
@@ -330,7 +331,7 @@ testcase tPCT
 
    call hCloseDocument
 
-endcase
+endcase 'tPCT
 '-------------------------------------------------------------------------------
 testcase tPBM
 
@@ -342,10 +343,10 @@ testcase tPBM
    sFilter = "PBM - Portable Bitmap (.pbm)"
    sExt = ".pbm"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PBMOptionen"
       if PBMOptionen.Exists (2) then
@@ -367,7 +368,7 @@ testcase tPBM
 
    call hCloseDocument
 
-endcase
+endcase 'tPBM
 '-------------------------------------------------------------------------------
 testcase tPGM
 
@@ -379,10 +380,10 @@ testcase tPGM
    sFilter = "PGM - Portable Graymap (.pgm)"
    sExt = ".pgm"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString  ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PGMOptionen"
       if PGMOptionen.Exists (2) then
@@ -404,7 +405,7 @@ testcase tPGM
 
    call hCloseDocument
 
-endcase
+endcase 'tPGM
 '-------------------------------------------------------------------------------
 testcase tPPM
 
@@ -416,10 +417,10 @@ testcase tPPM
    sFilter = "PPM - Portable Pixelmap (.ppm)"
    sExt = ".ppm"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString  ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PPMOptionen"
       if PPMOptionen.Exists (2) then
@@ -441,7 +442,7 @@ testcase tPPM
 
    call hCloseDocument
 
-endcase
+endcase 'tPPM
 '------------------------------------------------------------------------------
 testcase tRAS
 
@@ -453,10 +454,10 @@ testcase tRAS
     sFilter = "RAS - Sun Raster Image (.ras)"
     sExt = ".ras"
     
-     '/// open the document
+     printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       if ( dir(OutputGrafikTBO+sExt) <> "") then
          Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'"
@@ -472,7 +473,7 @@ testcase tRAS
 
    call hCloseDocument
 
-endcase
+endcase 'tRAS
 '------------------------------------------------------------------------------
 testcase tTIFF
 
@@ -484,10 +485,10 @@ testcase tTIFF
     sFilter = "TIFF - Tagged Image File Format (.tif;.tiff)"
     sExt = ".tif"
     
-     '/// open the document
+     printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       if ( dir(OutputGrafikTBO+sExt) <> "") then
          Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'"
@@ -503,7 +504,7 @@ testcase tTIFF
 
    call hCloseDocument
 
-endcase
+endcase 'tTIFF
 '------------------------------------------------------------------------------
 testcase tXPM
 
@@ -515,10 +516,10 @@ testcase tXPM
     sFilter = "XPM - X PixMap (.xpm)"
     sExt = ".xpm"
     
-     '/// open the document
+     printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       if ( dir(OutputGrafikTBO+sExt) <> "") then
          Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'"
@@ -534,7 +535,7 @@ testcase tXPM
 
    call hCloseDocument
 
-endcase
+endcase 'tXPM
 '-------------------------------------------------------------------------------
 testcase tGIF
 
@@ -546,10 +547,10 @@ testcase tGIF
    sFilter = "GIF - Graphics Interchange Format (.gif)"
    sExt = ".gif"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
 
-   '/// save it ///'
+   printlog " save it ///'
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "GIFOptionen"
       if GIFOptionen.Exists (2) then
@@ -572,7 +573,7 @@ testcase tGIF
 
    call hCloseDocument
 
-endcase
+endcase 'tGIF
 '-------------------------------------------------------------------------------
 testcase tJPEG
 
@@ -584,10 +585,10 @@ testcase tJPEG
    sFilter = "JPEG - Joint Photographic Experts Group (.jpg;.jpeg;.jfif;.jif;.jpe)"
    sExt = ".jpg"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
 
-   '/// save it ///'
+   printlog " save it "
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "JpegOptionen"
       if JpegOptionen.Exists (2) then
@@ -610,5 +611,5 @@ testcase tJPEG
 
    call hCloseDocument
 
-endcase
+endcase 'tJPEG
 '-------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc
index 69f9d7b2cdf0..e3a0d370f051 100755
--- a/testautomation/graphics/optional/includes/global/g_character.inc
+++ b/testautomation/graphics/optional/includes/global/g_character.inc
@@ -366,6 +366,10 @@ testcase tDialogCharacter
 endcase
 
 testcase tSetFormatCharacter
+    if iSprache = 48 then
+        qaerrorlog "Test not adapted to polish, 48."
+        goto endsub
+    endif
     Dim i as integer
     dim iWest as integer
     dim iAsian as integer
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index a54bf067db05..4b876e8871fa 100755
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -44,6 +44,10 @@
 '*
 '\*******************************************************************
 testcase tiToolsSpellcheckCorrect
+    if iSprache = 48 then
+        qaerrorlog "This test is not adapted for polish, 48."
+        got endsub
+    endif
 
     Dim DieDatei as String
     dim lFiles(100) as string
@@ -152,15 +156,19 @@ 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
 
-    '/// New document ///'
+    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"
@@ -181,39 +189,40 @@ testcase tiToolsSpellcheckError
                 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
 
-    '/// delete ignore word list ///'
+    printlog "Delete ignore word list"
     if (not wIgnorierenlisteLoeschen) then
         qaErrorLog "Can't get into Dictionary lists"
         goto endsub
     end if
 
-    '/// create 1 textbox with 1 spelling error (test replace always) ///'
+    printlog "Create 1 textbox with 1 spelling error (test replace always)"
     hTextrahmenErstellen (FehlerText$,30,30,90,40)
     
-    printlog "Setting Text to english"
-    sleep 1
-    EditSelectAll
-    FormatCharacter
-    sleep 1
-    Kontext
-    Messagebox.SetPage TabFont
-    Kontext "TabFont"
-    Language.Select 41
-    TabFont.OK
+    'printlog "Setting Text to english"
+    'sleep 1
+    'EditSelectAll
+    'FormatCharacter
+    'sleep 1
+    'Kontext
+    'Messagebox.SetPage TabFont
+    'Kontext "TabFont"
+    'Language.Select 41
+    'TabFont.OK
     
     hTypeKeys "<HOME>"
-    '/// call 'Tools->Spellcheck->Check' ///'
+    printlog "Call 'Tools->Spellcheck->Check'"
     ToolsSpellcheck
-    '/// Spellcheck dialog has to come up, wrong word is selected ///'
+    printlog "Spellcheck dialog has to come up, wrong word is selected."
     Kontext "Spellcheck"
     if Spellcheck.Exists then
-        '/// there has to be at least ONE suggestion ///'
+        printlog "There has to be at least ONE suggestion."
         if (Suggestions.GetItemCount < 1) then
-            '/// if no suggestion avilable: ///'
+            printlog "If no suggestion avilable:"
             warnlog "   - no suggestion for the language: "+DictionaryLanguage.GetSelIndex+" '"+DictionaryLanguage.GetSelText+"' , press check button..."
-            '///+ press button 'Check word'  ///'
+            printlog "+ press button 'Check word'"
             Pruefen.click
             if (Suggestions.GetItemCount < 1) then
                 warnlog " STILL no suggestions :-( errors will follow "
@@ -222,20 +231,20 @@ testcase tiToolsSpellcheckError
             end if
         end if
         Dummy$=Suggestions.GetItemText (1)
-        '/// select first spellcheck suggestion (click it!) ///'
+        printlog "Select first spellcheck suggestion (click it!)."
         Suggestions.Select (1)
-        '/// check if textfield 'word' has changed to selected word ///'
+        printlog "Check if textfield 'word' has changed to selected word."
         if (Suggestions.GetSelText <> Dummy$) Then
-            Warnlog "  - Suggestion not used"
+            Warnlog "Suggestion not used"
         else
-            Printlog "  Suggestion is used"
+            Printlog "Suggestion is used"
         end if
         sleep 1
         kontext "Spellcheck"
-        '/// click button 'Always replace' ///'
+        printlog "click button 'Always replace'"
         ChangeAll.Click
-        '/// spellcheck dialog has to disappear and ///'
-        '///+ There has to come up only one active: 'Spellcheck of entire document has been completed [OK]' ///'
+        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 + "'"
@@ -246,10 +255,10 @@ testcase tiToolsSpellcheckError
             Spellcheck.Close
             Kontext "Active"
             if active.exists(5) then
-               Printlog " Spellcheck dialog closed'" + active.gettext + "'"
+               Printlog "Spellcheck dialog closed'" + active.gettext + "'"
                Active.OK
             else
-               Printlog " Spellcheck dialog closed'"
+               Printlog "Spellcheck dialog closed'"
             end if
         end if
     else
@@ -261,33 +270,33 @@ testcase tiToolsSpellcheckError
         end if
     end if
 
-    '/// delete textbox ///'
+    printlog "delete textbox"
     EditSelectAll
     hTypeKeys "<DELETE>"
     sleep 1
 
-    '/// create same textbox again (test IGNORE function) ///'
-    Printlog "  check function Ignore"
+    printlog "Create same textbox again (test IGNORE function)."
+    Printlog "Check function Ignore"
     hTextrahmenErstellen (FehlerText$,30,30,80,40)
-    '/// call 'Tools->Spellcheck->Check' ///'
+    printlog "All 'Tools->Spellcheck->Check'."
     
-    printlog "Setting Text to english"
-    sleep 1
-    EditSelectAll
-    FormatCharacter
-    sleep 1
-    Kontext
-    Messagebox.SetPage TabFont
-    Kontext "TabFont"
-    Language.Select 41
-    TabFont.OK
+    'printlog "Setting Text to english"
+    'sleep 1
+    'EditSelectAll
+    'FormatCharacter
+    'sleep 1
+    'Kontext
+    'Messagebox.SetPage TabFont
+    'Kontext "TabFont"
+    'Language.Select 41
+    'TabFont.OK
     
     ToolsSpellcheck
     Kontext "Spellcheck"
-    '/// press button 'Ignore' ///'
+    printlog "press button 'Ignore'"
     IgnoreOnce.Click
-    '/// spellcheck dialog has to disappear and ///'
-    '///+ There has to come up only one active: 'Spellcheck of entire document has been completed [OK]' ///'
+    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 " Spellcheck ended because of only 1 defined error. And Ignore worked.'" + active.gettext + "'"
@@ -305,7 +314,7 @@ testcase tiToolsSpellcheckError
         end if
     end if
 
-    '/// call 'Tools->Spellcheck->Check' ///'
+    printlog "Call 'Tools->Spellcheck->Check."
     ToolsSpellcheck
     Kontext "Spellcheck"
     if Spellcheck.Exists Then
@@ -322,32 +331,32 @@ testcase tiToolsSpellcheckError
         Warnlog "  Spellcheck ended even we only ignored the error"
     end if
 
-    '/// delete textbox ///'
+    printlog "delete textbox."
     EditSelectAll
     hTypeKeys "<DELETE>"
     sleep 1
 
-    '/// create same textbox again (test ALWAYS IGNORE function) ///'
+    printlog "create same textbox again (test ALWAYS IGNORE function)."
     hTextrahmenErstellen (FehlerText$,30,30,60,40)
     
-    printlog "Setting Text to english"
-    sleep 1
-    EditSelectAll
-    FormatCharacter
-    sleep 1
-    Kontext
-    Messagebox.SetPage TabFont
-    Kontext "TabFont"
-    Language.Select 41
-    TabFont.OK
+    'printlog "Setting Text to english"
+    'sleep 1
+    'EditSelectAll
+    'FormatCharacter
+    'sleep 1
+    'Kontext
+    'Messagebox.SetPage TabFont
+    'Kontext "TabFont"
+    'Language.Select 41
+    'TabFont.OK
     
-    '/// call 'Tools->Spellcheck->Check' ///'
+    printlog "Call 'Tools->Spellcheck->Check'."
     ToolsSpellcheck
     Kontext "Spellcheck"
-    '/// click button 'Always Ignore' ///'
+    printlog "click button 'Always Ignore."
     IgnoreAll.Click
-    '/// spellcheck dialog has to disappear and ///'
-    '///+ There has to come up only one active: 'Spellcheck of entire document has been completed [OK]' ///'
+    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 " Spellcheck ended because of only 1 defined error. And Ignore worked.'" + active.gettext + "'"
@@ -367,7 +376,7 @@ testcase tiToolsSpellcheckError
 
     Printlog "- Delete ignore list"
     sleep 1
-    '/// delete ignore word list ///'
+    printlog "Delete ignore word list."
     if (not wIgnorierenlisteLoeschen) then
         qaErrorLog "Can't get into Dictionary lists"
         goto endsub
@@ -377,7 +386,10 @@ endcase 'tiToolsSpellcheckError
 
 '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 testcase tiToolsSpellcheckCheck
-
+    if iSprache = 48 then
+        qaerrorlog "This test is not adapted for polish, 48."
+        got endsub
+    endif
     Dim Datei$
     Dim sWord(2) as string
     Dim i as integer
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
index d602ae643580..4f31ca9ea2be 100755
--- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
@@ -1129,115 +1129,116 @@ endcase
 '-------------------------------------------------------------------------------------
 testcase tSlideShowShowHideSlide
 
-   dim saSlideNames(4) as string
-   dim i as integer
-
-   S1 = glLocale (2) + " 1"
-   S2 = glLocale (2) + " 2"
-   S3 = glLocale (2) + " 3"
-   S4 = glLocale (2) + " 4"
-   saSlideNames(1) = S1
-   saSlideNames(2) = S2
-   saSlideNames(3) = S3
-   saSlideNames(4) = S4
+    dim saSlideNames(4) as string
+    dim i as integer
+    
+    S1 = glLocale (2) + " 1"
+    S2 = glLocale (2) + " 2"
+    S3 = glLocale (2) + " 3"
+    S4 = glLocale (2) + " 4"
+    saSlideNames(1) = S1
+    saSlideNames(2) = S2
+    saSlideNames(3) = S3
+    saSlideNames(4) = S4
 
-   '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///'
-   hFileOpen   ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
-   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
-   Kontext "Navigator"
-   if Navigator.exists then
-      '///+ close navigator ! ///'
+    printlog "Open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides)"
+    hFileOpen   ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
+    sleep (10)
+    printlog "check if the document is writable"
+    if fIsDocumentWritable = false then
+        printlog "make the document writable and check if it's succesfull"
+        if fMakeDocumentWritable = false then
+            warnlog "   The document can't be make writeable. Test stopped."
+            goto endsub
+        endif
+    endif
+    Kontext "Navigator"
+    if Navigator.exists then
+      printlog "close navigator"
       Navigator.Close
-   else
+    else
       printlog "Navigator: NOT available"
-   endif
-   '/// - View->Workspace->Slides View ///'
-   ViewWorkspaceSlidesView
-      sleep (1)
-      Kontext "Slides"
-      '///Selecting 2nd slide
-      SlidesControl.TypeKeys "<PAGEDOWN>"
-      '///Hiding 2nd slide
-      SlideShowHideSlide
-      '///Selecting 4th slide
-      SlidesControl.TypeKeys "<PAGEDOWN>" ,2
-      '///Hiding 4th slide
-      SlideShowHideSlide
- 
-      sleep (2)
-   '/// View->Workspace->Drawing View ///'
-   ViewWorkspaceDrawingView
-   kontext "DocumentImpress"
-   DocumentImpress.TypeKeys "<HOME>"
-   sleep (2)
-   '/// SlideShow->Slide Show Settings... ///'
-   SlideShowPresentationSettings
-      Kontext "Bildschirmpraesentation"
-      sleep (2)
-      '/// check Radio button 'Type': 'Window' ///'
-      Fenster.Check
-      sleep (1)
-      '/// close dialog 'Slide Show' with OK ///'
-      Bildschirmpraesentation.OK
-   '/// start the slideshow with 'Slide Show->Slide Show' ///'
-   SlideShowSlideshow
-      sleep (1)
-      kontext "DocumentPresentation"
-      '/// type the key [MOD1 SHIFT F5] to open the navigator ///' '--------------------------------------------------------------------------
-      DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
-      sleep (1)
-      kontext "NavigatorDraw"
-      for i = 1 to 2
-         if ((i mod 2) = 1) then ' for all odd numbers (ungerade) do
+    endif
+    printlog "View->Workspace->Slides View"
+    ViewWorkspaceSlidesView
+    sleep (1)
+    Kontext "Slides"
+    printlog "Selecting 2nd slide"
+    SlidesControl.TypeKeys "<PAGEDOWN>"
+    printlog "Hiding 2nd slide"
+    SlideShowHideSlide
+    printlog "Selecting 4th slide"
+    SlidesControl.TypeKeys "<PAGEDOWN>" ,2
+    printlog "Hiding 4th slide"
+    SlideShowHideSlide
+    
+    sleep (2)
+    printlog "View->Workspace->Drawing View"
+    ViewWorkspaceDrawingView
+    kontext "DocumentImpress"
+    DocumentImpress.TypeKeys "<HOME>"
+    sleep (2)
+    printlog "SlideShow->Slide Show Settings..."
+    SlideShowPresentationSettings
+    Kontext "Bildschirmpraesentation"
+    sleep (2)
+    printlog "check Radio button 'Type': 'Window'"
+    Fenster.Check
+    sleep (1)
+    printlog "close dialog 'Slide Show' with OK "
+    Bildschirmpraesentation.OK
+    printlog "start the slideshow with 'Slide Show->Slide Show'"
+    SlideShowSlideshow
+    sleep (1)
+    kontext "DocumentPresentation"
+    printlog "type the key [MOD1 SHIFT F5] to open the navigator" '--------------------------------------------------------------------------
+    DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>"
+    sleep (1)
+    kontext "NavigatorDraw"
+    for i = 1 to 2
+        if ((i mod 2) = 1) then ' for all odd numbers (ungerade) do
+            printlog "Getting slide names"
             fGetSlideName(saSlideNames(i))
             kontext "DocumentPresentation"
             DocumentPresentation.TypeKeys "<pagedown>"
             sleep (3)
-         endif
-         Kontext "NavigatorDraw"
-         if NavigatorDraw.exists (5) then
+        endif
+        Kontext "NavigatorDraw"
+        if NavigatorDraw.exists (5) then
             sleep 1
-            '/// check in list, if the page changed ///'
+            printlog "check in list, if the page changed"
             if ((i mod 2) = 1) then ' for all odd numbers (ungerade) do
-               if i = Liste.GetSelIndex then
-                  qaerrorlog "the Navigator didn't update!"
-               endif
+                if i = Liste.GetSelIndex then
+                    qaerrorlog "the Navigator didn't update!"
+                endif
             endif
-         else
+        else
             warnlog "   Navigator doesn't exist?!?!?"
-         endif
-         sleep (1)
-      next i
-      sleep (3)
-      Kontext "DocumentPresentation"
-      DocumentPresentation.TypeKeys "<pagedown>"
-      sleep (2)
-      DocumentPresentation.TypeKeys "<pagedown>"
-      sleep (5)
-      try
-         DocumentPresentation.MouseDown 50,50
-         DocumentPresentation.MouseUp 50,50 'This one works to recognice the not ending.
-         warnlog "   Presentation did NOT END!!!"
-      catch
-         printlog "   ended right."
-      endcatch
-      sleep (2)
-      Kontext "Navigator"
-      if Navigator.exists then
-         '///+ close navigator ! ///'
-         Navigator.Close
-      else
-         printlog "Navigator: NOT available"
-      endif
-   Call hCloseDocument
+        endif
+        sleep (1)
+    next i
+    sleep (3)
+    Kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<pagedown>"
+    sleep (2)
+    DocumentPresentation.TypeKeys "<pagedown>"
+    sleep (5)
+    try
+        DocumentPresentation.MouseDown 50,50
+        DocumentPresentation.MouseUp 50,50 'This one works to recognice the not ending.
+        warnlog "   Presentation did NOT END!!!"
+    catch
+        printlog "   ended right."
+    endcatch
+    sleep (2)
+    Kontext "Navigator"
+    if Navigator.exists then
+        printlog "close navigator !"
+        Navigator.Close
+    else
+        printlog "Navigator: NOT available"
+    endif
+    Call hCloseDocument
 endcase
 
 '------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 2eaa2c872253..fdc87d40b742 100755
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -626,8 +626,8 @@ endcase 'i_us_presentation6
 '00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---....
 
 testcase i_us_presentation7
-    qaErrorLog "#i70754# - i_us_presentation7 outcommented due to bug."
-    goto endsub
+    'qaErrorLog "#i70754# - i_us_presentation7 outcommented due to bug."
+    'goto endsub
     dim sFilter as string
     dim sFileName as string
     dim PresentationFile6 as string