CWS-TOOLING: integrate CWS automation310d_DEV300

2009-03-19 09:49:31 +0100 jsk  r269729 : #i100313 - Fix newly introduced typo printloig
2009-03-19 08:13:52 +0100 jsk  r269714 : #i100344 - Extend the fix
2009-03-19 07:58:23 +0100 jsk  r269713 : #i100343 - Check for bad variable in tUsageTracking1
2009-03-19 07:54:56 +0100 jsk  r269712 : #i100344 - tEvolutionProperties - Evolution missing fix
2009-03-19 07:53:42 +0100 jsk  r269711 : #i100313 - ReportBuilder timeout fix
2009-03-18 14:43:49 +0100 wg  r269668 : i100233
2009-03-18 14:43:33 +0100 wg  r269667 : i100233
2009-03-18 14:41:58 +0100 wg  r269666 : i100233
2009-03-18 14:01:54 +0100 wg  r269661 : i100233
2009-03-17 20:39:26 +0100 jsk  r269631 : #i100233#
2009-03-17 20:25:45 +0100 jsk  r269630 : #i100232#
2009-03-17 20:22:13 +0100 jsk  r269629 : #i100233#
2009-03-17 16:05:58 +0100 wg  r269615 : i100233
2009-03-17 14:32:56 +0100 jsk  r269607 : #i100039#
2009-03-17 13:52:32 +0100 wg  r269606 : i100233
2009-03-17 13:39:54 +0100 jsk  r269604 : #i100267#
2009-03-17 13:36:31 +0100 wg  r269603 : i100233
2009-03-17 13:30:59 +0100 jsk  r269602 : #i100233#

7 files changed, 111 insertions, 362 deletions

diff --git a/testautomation/graphics/optional/d_updt.bas b/testautomation/graphics/optional/d_updt.bas
deleted file mode 100755
index fe261d48b32b..000000000000
--- a/testautomation/graphics/optional/d_updt.bas
+++ /dev/null
@@ -1,95 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: d_updt.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:35 $
-'*
-'* 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@sun.com
-'*
-'* short description : Draw Required Test
-'*
-'\*****************************************************************
-
-public glLocale (15*20) as string
-global ExtensionString as String
-
-sub main
-    Printlog "--------------------- Draw Required Test ------------------- "
-    Call hStatusIn ( "Graphics","d_updt.bas")
-
-    use "graphics\tools\id_tools.inc"
-    use "graphics\tools\id_tools_2.inc"
-    use "graphics\required\includes\global\id_001.inc"                        'File
-    use "graphics\required\includes\global\id_002.inc"                        'Edit
-    use "graphics\required\includes\global\id_003.inc"                        'View
-    use "graphics\required\includes\global\id_004.inc"                        'Insert
-    use "graphics\required\includes\global\id_005.inc"                        'Format
-    use "graphics\required\includes\global\id_006.inc"                        'Tools
-    use "graphics\required\includes\global\id_007.inc"                        'Modify
-    use "graphics\required\includes\global\id_008.inc"                        'Window
-    use "graphics\required\includes\global\id_009.inc"                        'Help
-    use "graphics\required\includes\global\id_011.inc"                        'Toolbars
-    use "graphics\required\includes\draw\d_002_.inc"
-    use "graphics\required\includes\draw\d_003_.inc"
-    use "graphics\required\includes\draw\d_005_.inc"
-    use "graphics\required\includes\draw\d_007.inc"
-
-    Call D_003_
-    call id_002
-    call id_011
-    Call D_002_
-    call id_003
-    call id_004
-    Call D_005_
-    call id_005
-    call id_006
-    call d_007
-    call id_007
-    call id_008
-    call id_009
-    call id_001
-    Call tFileExportAsPDF
-    Call tExportAsPDFButton
-
-   Call hStatusOut
-end sub
-'----------------------------------------------
-
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    use "global\required\includes\g_option.inc"
-    use "global\required\includes\g_customize.inc"
-    use "global\required\includes\g_001.inc"
-    use "global\required\includes\g_009.inc"
-   Call GetUseFiles
-   gApplication   = "Draw"
-end sub
-
diff --git a/testautomation/graphics/optional/i_updt_1.bas b/testautomation/graphics/optional/i_updt_1.bas
deleted file mode 100755
index 39c42ea7e86b..000000000000
--- a/testautomation/graphics/optional/i_updt_1.bas
+++ /dev/null
@@ -1,84 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: i_updt_1.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:38 $
-'*
-'* 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@sun.com
-'*
-'* short description : Impress Required Test (Part 1)
-'*
-'\*****************************************************************
-
-public glLocale (15*20) as string
-global ExtensionString as String
-
-sub main
-    Printlog " -------------------- Impress-Required-Test -----------------------------"
-    Call hStatusIn ( "Graphics","i_updt_1.bas")
-    
-    use "graphics\tools\id_tools.inc"
-    use "graphics\tools\id_tools_2.inc"
-    use "graphics\required\includes\global\id_002.inc"                        'Edit
-    use "graphics\required\includes\global\id_003.inc"                        'View
-    use "graphics\required\includes\global\id_004.inc"                        'Insert
-    use "graphics\required\includes\global\id_005.inc"                        'Format
-    use "graphics\required\includes\global\id_006.inc"                        'Tools
-    use "graphics\required\includes\impress\im_003_.inc"                   'Ansicht
-    use "graphics\required\includes\impress\im_004_.inc"                   'Einfuegen
-
-   if hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () ) = FALSE then
-      qaErrorLog "Locales doesn't exist in file : "+gTesttoolPath + "graphics\tools\locale_1.txt"       ' this is needed for spellchecking.
-   endif
-
-   call id_002
-   Call im_003_
-   call id_003
-   Call im_004_
-   call id_004
-   call id_005
-   call id_006
-
-  Call hStatusOut
-end sub
-
-'----------------------------------------------
-sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   use "global\required\includes\g_option.inc"
-   use "global\required\includes\g_option2.inc"
-   use "global\required\includes\g_customize.inc"
-   use "global\required\includes\g_001.inc"
-   use "global\required\includes\g_009.inc"
-    gApplication   = "IMPRESS"
-    Call GetUseFiles()
-end sub
-
diff --git a/testautomation/graphics/optional/i_updt_2.bas b/testautomation/graphics/optional/i_updt_2.bas
deleted file mode 100755
index b283c61f48ab..000000000000
--- a/testautomation/graphics/optional/i_updt_2.bas
+++ /dev/null
@@ -1,84 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: i_updt_2.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:38 $
-'*
-'* 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@sun.com
-'*
-'* short description : Impress Required (Test Part 2)
-'*
-'\*****************************************************************
-
-public glLocale (15*20) as string
-global ExtensionString as String
-
-sub main
-      Printlog " -------------------- Impress-Required-Test -----------------------------"
-      Call hStatusIn ( "Graphics","i_updt_2.bas")
-
-    use "graphics\tools\id_tools.inc"
-    use "graphics\tools\id_tools_2.inc"
-    use "graphics\required\includes\global\id_001.inc"                        'File
-    use "graphics\required\includes\global\id_007.inc"                        'Kontext
-    use "graphics\required\includes\global\id_008.inc"                        'Window
-    use "graphics\required\includes\global\id_009.inc"                        'Help
-    use "graphics\required\includes\global\id_011.inc"                        'Toolbars
-    use "graphics\required\includes\impress\im_007_.inc"                   'Praesentation
-
-   if hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () ) = FALSE then
-      qaErrorLog "Locales doesn't exist in file : "+gTesttoolPath + "graphics\tools\locale_1.txt"    ' this is needed for spellchecking.
-   endif
-
-   Call tFileExportAsPDF
-   Call tExportAsPDFButton
-   call id_001
-   Call im_007_
-   call id_008
-   call id_009
-   call id_007
-   call id_011
-
-  Call hStatusOut
-end sub
-
-'----------------------------------------------
-sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   use "global\required\includes\g_option.inc"
-   use "global\required\includes\g_option2.inc"
-   use "global\required\includes\g_customize.inc"
-   use "global\required\includes\g_001.inc"
-   use "global\required\includes\g_009.inc"
-    gApplication   = "IMPRESS"
-    Call GetUseFiles()
-end sub
-
diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc
index 209305a16ae5..3d46d6fbba23 100755
--- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc
+++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc
@@ -333,6 +333,8 @@ testcase tContextSaveAsPicture
              endif
              hTypeKeys "<DELETE>"
             '/// Open the next file via Insert->Graphics From File ///'
+            call hCloseDocument
+            call hNewDocument
              InsertGraphicsFromFile
              Kontext "GrafikEinfuegenDlg"
              if GrafikEinfuegenDlg.exists(5) then
@@ -622,7 +624,7 @@ testcase tContextSavePictureLinkAsPicture
                                     else
                                        warnlog "Ras should not have been selected when we opened a '" + Filetype + "'-file."
                                     endif
-                       case "wmf" : if (Filetype = "wmf") then
+                       case "wmf" : if (Filetype = "wmf") or (Filetype = "emf") then
                                        printlog "   " + Filetype + " will be saved as Wmf, correct."
                                        SavedFileType = "wmf"
                                        if Filetype = "wmf" then Testsize = true
@@ -780,6 +782,8 @@ testcase tContextSavePictureLinkAsPicture
                 Kontext "DocumentDraw"
              endif
              hTypeKeys "<DELETE>"
+            call hCloseDocument
+            call hNewDocument
             '/// Open the next file via Insert->Graphics From File ///'
              InsertGraphicsFromFile
              Kontext "GrafikEinfuegenDlg"
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
index 5c16f43722be..bac399c2f611 100755
--- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
@@ -206,7 +206,9 @@ testcase tiPengineAnimationEffectsPreview
         sleep (2)
     '/// close application ///'
     Call hCloseDocument
-endcase
+endcase 'tiPengineAnimationEffectsPreview
+
+'------------------------------------------------------------------------------
 
 testcase tiPengineAnimationEffectsOptions
     dim bError as boolean
@@ -309,7 +311,7 @@ SlideShowCustomAnimation
    EffectRemove.Click
    '/// close application ///'
    Call hCloseDocument
-endcase
+endcase 'tiPengineAnimationEffectsOptions
 
 '------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -370,7 +372,7 @@ testcase tiPengineAllShapesAndEffects
 '/// Close Application ///'
     Call hCloseDocument
     Printlog "Finished Optional-test for Presentation-Engine"
-endcase
+endcase 'tiPengineAllShapesAndEffects
 
 '-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -381,17 +383,17 @@ testcase tiPengine2ObjectsGetsEffects
     dim e as integer
     dim sFileName as string
 
-    '/// the Presentation-Engine consists of showing the presentation, with all it's effects. ///'
+    printlog "the Presentation-Engine consists of showing the presentation, with all it's effects."
 
-    '/// Create a new presentation. ///'
+    printlog "Create a new presentation."
     Call hNewDocument
     sleep (1)
 
     kontext "Toolbar"
     sleep (1)
     printlog "insert a Smiley."
-    '/// From the toolbar: Insert three objects: ///'
-    '/// insert a Smiley. ///'
+    printlog "From the toolbar: Insert three objects:"
+    printlog "insert a Smiley."
     kontext "Toolbar"
     if Toolbar.Exists then
         if Toolbar.IsVisible then
@@ -414,51 +416,51 @@ testcase tiPengine2ObjectsGetsEffects
             kontext "SymbolShapes"
 	    SymbolShapes.Close
 
-            '/// Unmark all objects ///'
+            printlog "Unmark all objects"
             hTypeKeys "<ESCAPE>"
 
-            '/// Mark the Smiley ///'
+            printlog "Mark the Smiley"
             hTypeKeys "<TAB>"
         else
             warnlog "No toolbar visible, please notify the test-administrator"
         end if
     else        
-        warnlog "bla bla" ' sch�nes warnlog
+        warnlog "toolbar not visible"
     end if
 
-    '/// Smiley inserted, time to add some effects. ///'
+    printlog "Smiley inserted, time to add some effects."
 
-    '/// Effect no 1 ///'
+    printlog "Effect no 1"
 
-    '/// 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)
-            '/// Find "Dissolve-in". ///' 
+            printlog "Find 'Dissolve-in'." 
             TabEntrance.TypeKeys "<DOWN>", 6
             Sleep (3)
             TabEntrance.Ok
             Printlog "Added effect 'Dissolve-in'"
         else
-            warnlog "uh hu?"
+            warnlog "Tab Entrance does not exist?"
         end if
         Kontext "Tasks"
 
-    '/// Effect no 2 ///'
+    printlog "Effect no 2"
 
-    '/// Add a second effect to the object ///'
+    printlog "Add a second effect to the object"
     EffectAdd.click
     
-    '/// Dialog 'Custom Animation' comes up ///'
-    '/// Switch to TabPage: Emphasis ///'
+    printlog "Dialog 'Custom Animation' comes up"
+    printlog "Switch to TabPage: Emphasis"
     kontext
     active.setPage(TabEmphasis)
     kontext "TabEmphasis"
@@ -466,7 +468,7 @@ testcase tiPengine2ObjectsGetsEffects
         DialogTest(TabEmphasis)
         Effects.Select 5    'Transparency
         Sleep (3)
-        '/// Close dialog 'Custom Animation' with 'OK' ///'
+        printlog "Close dialog 'Custom Animation' with 'OK'"
         TabEmphasis.OK
         Printlog "Added effect 'Transparency'"
     else
@@ -474,34 +476,34 @@ testcase tiPengine2ObjectsGetsEffects
     end if
     Kontext "Tasks"
 
-    '/// Effect no 3 ///'
+    printlog "Effect no 3"
 
-    '/// Insert new slide ///'
+    printlog "Insert new slide"
     InsertSlide
     Printlog "Inserted new Slide" 
 
     kontext "Slides"
-    '/// Make sure the last slide is selcted ///'
+    printlog "Make sure the last slide is selcted"
     SlidesControl.TypeKeys "<TAB>"
     SlidesControl.TypeKeys "<PAGEDOWN>", 3
     Sleep (1)
 
-    '/// Insert new object ///'
+    printlog "Insert new object"
     Call hTextrahmenErstellen ("Test text for the second slide to test the PresentationEngine", 35, 35, 70, 70)
 
-    '/// Add the Transformation-Effect "put on the brakes" ///' 
+    printlog "Add the Transformation-Effect 'put on the brakes'" 
     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
-                '/// Add Transformation-Effect: "Put on the Breaks" ///' ' ist das Sprachabh�nig 
-                TabEntrance.TypeKeys "<DOWN>", 30  ' ist das Sprachabh�nig
+                printlog "Add Transformation-Effect: 'Put on the Breaks'"
+                TabEntrance.TypeKeys "<DOWN>", 30  
                 Sleep (3)
                 TabEntrance.Ok
                 Printlog "Added effect 'Put on the Breaks'"
@@ -510,18 +512,18 @@ testcase tiPengine2ObjectsGetsEffects
             end if
             Kontext "Tasks"
 
-            '/// Effect no 4 ///'
+            printlog "Effect no 4"
 
-            '/// Click button 'Add...' ///'
+            printlog "Click button 'Add...'"
             EffectAdd.click
-            '/// Dialog 'Custom Animation' comes up ///'
+            printlog "Dialog 'Custom Animation' comes up"
             kontext
-            '/// Switch to TabPage: Motion Paths ///'
+            printlog "Switch to TabPage: Motion Paths"
             active.setPage(TabMotionPaths)
             kontext "TabMotionPaths"
             if TabMotionPaths.exists(5) then
-                '/// Add "motion-path"-effect:  '"schwosch"  ///'  ' ist das Sprachabh�nig  
-                TabMotionPaths.TypeKeys "<DOWN>", 66  ' ist das Sprachabh�nig
+                printlog "Add motion-path-effect:  'schwosch'"
+                TabMotionPaths.TypeKeys "<DOWN>", 66 
                 Sleep (3)                
                 TabMotionPaths.Ok
                 Printlog "Added effect 'Schwosch'"
@@ -530,33 +532,37 @@ testcase tiPengine2ObjectsGetsEffects
                 warnlog "Couldn't find the Tabpage: MotionPaths. Check why."
             end if
 
-        '/// Press 'PageUp' to get to the first slide. ///'
+        printlog "Press 'PageUp' to get to the first slide"
         hTypeKeys "<PAGEUP>"
 
-        '/// Run the slideshow. ///'
+        printlog "Run the slideshow with F5."
         hTypeKeys "<F5>"
-
+        Sleep (5)
         kontext "DocumentPresentation"
         if DocumentPresentation.Exists (15) then
-            Printlog "Presentation started"
+            Printlog "Presentation started, calling 1st effect, 1st object."
             DocumentPresentation.TypeKeys "<SPACE>"
             sleep (5)
         else
             warnlog "Slideshow didn't start. Check why."
-            ' Wenn keine Slideshow vorhanden ist,
-            ' dann kann man auch den ganzen Test abbrechen            
         end if
-
+        printlog "calling 2nd effect, 1st object."
         DocumentPresentation.TypeKeys "<SPACE>"
         Sleep (5)
+        printlog "calling 2nd slide."
         DocumentPresentation.TypeKeys "<SPACE>"
         Sleep (5)
+        printlog "calling 1st effect, 2nd object"
         DocumentPresentation.TypeKeys "<SPACE>"
         Sleep (5)
+        printlog "calling 2nd effect, 2nd object"
         DocumentPresentation.TypeKeys "<SPACE>"
         Sleep (5)
+        printlog "ending presentation"
         DocumentPresentation.TypeKeys "<SPACE>"
         Sleep (5)
+        Kontext "DocumentPresentation"
+        printlog "getting back to edit view."
         DocumentPresentation.TypeKeys "<SPACE>"
         
         if DocumentPresentation.Exists(5) then 
@@ -565,10 +571,10 @@ testcase tiPengine2ObjectsGetsEffects
 
         Kontext "DocumentImpress"
 
-    '/// Close the document ///'
+    printlog "Close the document"
     Call hCloseDocument
     Printlog "Finished Optional-test for Presentation-Engine"
-endcase
+endcase 'tiPengine2ObjectsGetsEffects
 
 '------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -607,5 +613,3 @@ Function TestAnimations
    AutomaticPreview.Check
    Kontext
 end Function
-
-
diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
index d297b14ed0e4..8a557a4b2197 100755
--- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
@@ -47,16 +47,16 @@ testcase i_us2_pres1
     dim PresentationFile1 as string
     PresentationFile1 = (ConvertPath (gOfficePath + "user\work\PwrPres1.odp"))
     kontext "DocumentImpress"
-    '/// New - Wizard - Presentation. ///'
+    printlog "New - Wizard - Presentation."
     FileAutopilotPresentation
-      printlog "   Called File-Autopilot-Presentation."
-      '/// Create from Template ///'
+      printlog "Called File-Autopilot-Presentation."
+      printlog "Create from Template"
       kontext "AutoPilotPraesentation1"
       FromTemplate.Check
       'This part is for language-indepencancy
       if gOOO = TRUE then
          TemplateRegion.Select (1)
-         '/// Choose a Presentation ///'
+         printlog "Choose a Presentation"
          TemplateList.Select (2)
       else
          TemplateRegion.Select (1)
@@ -70,10 +70,10 @@ testcase i_us2_pres1
                endif
             endif
          endif
-         '/// Choose a Presentation ///'
+         printlog "Choose a Presentation"
          TemplateList.Select (4)
       endif
-      '/// Next ///'
+      printlog "Next"
       Nextbutton.Click
       sleep (1)
       Backbutton.Click
@@ -82,9 +82,9 @@ testcase i_us2_pres1
 
       printlog "   Switched to the second Wizard-page."
       sleep (1)
-      '/// Presentations ///'
+      printlog "Presentations"
       kontext "AutoPilotPraesentation2"
-      '/// Output: Screen ///'
+      printlog "Output: Screen"
       if gOOO = TRUE then  'OpenOffice.org
          Background.Select (2)
          if Backgroundchoice.GetItemCount < 2 then
@@ -110,42 +110,43 @@ testcase i_us2_pres1
          Backgroundchoice.Select (5)
       endif
       Screen.Check
-      '/// Next ///'
+      printlog "Next"
       Nextbutton.Click
 
       printlog "   Switched to the third Wizard-page."
       sleep (1)
       kontext "AutoPilotPraesentation3"
-      '/// Random Effect. Random Speed. Click through every choice. ///'
+      printlog "Random Effect. Random Speed. Click through every choice."
       Effect.Select (15)
       Speed.Select (3)
+      WaitSlot (5000)
       Automatic.Check
       Timebutton.SetText "00:00:15"
       Break.SetText "00:00:20"
       Logo.Check
-      '/// Next ///'
+      printlog "Next"
       Nextbutton.Click
 
       printlog "   Switched to the fourth Wizard-page."
       sleep (1)
       kontext "AutoPilotPraesentation4"
-      '/// Fill in some company-name-subject-text ///'
+      printlog "Fill in some company-name-subject-text"
       AddName.SetText "Lala1"
       AddTopic.SetText "Lala2"
       Askinformation.SetText "Lala3"
-      '/// Next ///'
+      printlog "Next"
       Nextbutton.Click
       printlog "   Switched to the fifth Wizard-page."
       sleep (1)
       kontext "AutoPilotPraesentation5"
       Summary.Check
-      '/// Create ///'
+      printlog "Create"
       WaitSlot (2000)
       AutoPilotPraesentation5.OK
 
    sleep (1)
    printlog "   Pressed 'Create'."
-   '/// Add a Slide via Insert - Slide. ///'
+   printlog "Add a Slide via Insert - Slide."
    Kontext "DocumentImpress"
    hTypeKeys "What we will talk about"
    gMouseClick 1,1
@@ -159,22 +160,22 @@ testcase i_us2_pres1
    SlidesControl.TypeKeys "<HOME><RETURN>"
    kontext "DocumentImpress"
    DocumentImpress.TypeKeys "<TAB>Text we just wrote..."
-   '/// Switch to the second slide. ///'
+   printlog "Switch to the second slide."
    kontext "Slides"
       SlidesControl.TypeKeys "<DOWN><RETURN>"
       SlidesControl.TypeKeys "<RETURN>"
    kontext "DocumentImpress"
-   '/// Insert three lines with text, all with different formatting. ///'
+   printlog "Insert three lines with text, all with different formatting."
       call hTextrahmenErstellen ("First line with text",20,50,70,50)
       call hTextrahmenErstellen ("Second line with text",20,60,70,60)
       call hTextrahmenErstellen ("Third line with text",20,70,70,70)
-   '/// Go down to the eleventh slide. ///'
+   printlog "Go down to the eleventh slide."
    kontext "Slides"
       SlidesControl.TypeKeys "<HOME>"
       SlidesControl.TypeKeys "<PAGEDOWN>", 10
       SlidesControl.TypeKeys "<RETURN>"
-   '/// Insert Smiley, + two circles around the eyes, + two new pupils, ///'
-   '/// placed at some interesteing place inside the circles. ///'
+   printlog "Insert Smiley, + two circles around the eyes, + two new pupils,"
+   printlog "placed at some interesteing place inside the circles."
       Kontext "Toolbar"
       SymbolShapes.TearOff
       sleep (1)
@@ -183,7 +184,8 @@ testcase i_us2_pres1
       sleep (1)
       kontext "DrawingObjectbar"
          AreaFilling.TypeKeys "<HOME>"
-         AreaFilling.TypeKeys "<DOWN>", 10    'Select (11) 'Lime-Green
+         AreaFilling.TypeKeys "<DOWN>", 10    
+         printlog "Select (11) 'Lime-Green"
          AreaFilling.TypeKeys "<RETURN>"
       sleep (1)
       gMouseMove (53,50,90,80)
@@ -192,79 +194,80 @@ testcase i_us2_pres1
       kontext "SymbolShapes"
       SymbolShapes.Close
       Kontext "DocumentImpress"
-      gMouseMove (60,43,70,65)    'Right eye
+      gMouseMove (60,43,70,65)    
       hTypeKeys "<Escape>"
       Kontext "Toolbar"
       Ellipsen.Click
-      gMouseMove (65,57,69,63)    'Right pupil
+      gMouseMove (65,57,69,63)    
       hTypeKeys "<Escape>"
       Kontext "Toolbar"
       Ellipsen.Click
-      gMouseMove (70,50,82,65)    'Left eye
+      gMouseMove (70,50,82,65)    
       hTypeKeys "<Escape>"
       Kontext "Toolbar"
       Ellipsen.Click
-      gMouseMove (77,57,80,63)    'Left pupil
+      gMouseMove (77,57,80,63)    
       hTypeKeys "<Escape>"
       sleep (1)
 
-   '/// Insert new slide. ///'
+   printlog "Insert new slide."
    kontext "Slides"
-      SlidesControl.TypeKeys "<PAGEDOWN>", 15  'To get to the last slide.
+   printlog "get to the last slide."
+      SlidesControl.TypeKeys "<PAGEDOWN>", 15  
       SlidesControl.TypeKeys "<RETURN>"
-   '/// Delete the two fields the stylist has. ///'
+   printlog "Delete the two fields the stylist has."
    kontext "DocumentImpress"
    gMouseClick 1,1
    EditSelectAll
    DocumentImpress.TypeKeys "<DELETE>"
-   '/// Insert-Picture-From File. (some crazy picture which fits the theme) ///'
+   printlog "Insert-Picture-From File. (some crazy picture which fits the theme)"
    InsertGraphicsFromFile
    Kontext "GrafikEinfuegenDlg"
-   '/// Open graphic  ///'
+   printlog "Open graphic"
    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\ball.eps")
    Oeffnen.Click
    gMouseClick 1,1
-   '/// Add a text above the picture. 'There is movement...' ///'
+   printlog "Add a text above the picture. 'There is movement..."
    call hTextrahmenErstellen ("There is movement...",20,20,70,30)
 
-   '/// Add a new slide. ///'
+   printlog "Add a new slide."
    InsertSlide
    printlog "   Inserted new slide."
    kontext "DocumentImpress"
    EditSelectAll
    DocumentImpress.TypeKeys "<DELETE>"
-   '/// Bla bla about everything... ///'
+   printlog "Bla bla about everything..."
    call hTextrahmenErstellen ("Bla bla about everything...",20,20,70,30)
 
-   '/// Add a new slide. ///'
+   printlog "Add a new slide."
    InsertSlide
    printlog "   Inserted new slide."
    kontext "DocumentImpress"
    EditSelectAll
    DocumentImpress.TypeKeys "<DELETE>"
-   '/// Write text:  Q & A  ///'
+   printlog "Write text:  Q & A"
    call hTextrahmenErstellen ("Q & A",20,20,70,30)
    DocumentImpress.TypeKeys "<SHIFT HOME>"
    sleep (1)
 
-   '/// Add a new slide. ///'
+   printlog "Add a new slide."
    InsertSlide
    kontext "DocumentImpress"
    EditSelectAll
    DocumentImpress.TypeKeys "<DELETE>"
-   '/// Thanks for listening, time for coffee... (ending) ///'
+   printlog "Thanks for listening, time for coffee... (ending)"
    call hTextrahmenErstellen ("Class dismissed...",20,20,70,30)
 
-   '/// Save Document ///'
+   printlog "Save Document"
    call hFileSaveAsKill (PresentationFile1)
    printlog "OK   saved at ", PresentationFile1
    sleep (1)
 
-   '/// Close Document ///'
+   printlog "Close Document"
    Call hCloseDocument
-endcase
+endcase 'i_us2_pres1
 
-'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---....
+'------------------------------------------------------------------------------
 
 testcase i_us2_pres2
     qaerrorlog "not yet ready."
@@ -275,10 +278,10 @@ testcase i_us2_pres2
    PresentationFile1 = (ConvertPath (gTesttoolPath + "graphics\required\input\rightfont.odp"))
    PresentationFile2 = (ConvertPath (gOfficePath + "user\work\xxxxxx9.odp"))
    kontext "DocumentImpress"
-   '/// New - Wizard - Presentation ///'
+   printlog "New - Wizard - Presentation"
    FileAutopilotPresentation
       printlog "   Called File-Autopilot-Presentation."
-      '/// Create from Template ///'
+      printlog "Create from Template"
       kontext "AutoPilotPraesentation1"
       EmptyPresentation.Check
       AutoPilotPraesentation1.TypeKeys "<DOWN>"
@@ -289,9 +292,9 @@ testcase i_us2_pres2
       else
          warnlog "   Pressing down didnt work as expected."
       endif
-      '/// Click the Open-button ///'
+      printlog "Click the Open-button"
       ExistingOpen.Click
-      '/// Check if the Open-dialogue is there ///'
+      printlog "Check if the Open-dialogue is there"
       kontext "GeneralFileDialog"
       if GeneralFileDialog.Exists(10) = FALSE then
          warnlog "   Open-file-dialogue didnt show up."
@@ -332,11 +335,11 @@ testcase i_us2_pres2
    if DocumentImpress.StatusIsProgress then
       sleep (5)
    endif
-   '/// Save Document ///'
+   printlog "Save Document"
    call hFileSaveAsKill (PresentationFile2)
    printlog "OK   saved at ", PresentationFile2
    sleep (1)
 
-   '/// Close Document ///'
+   printlog "Close Document"
    Call hCloseDocument
-endcase
+endcase 'i_us2_pres2
diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc
index c32f7b4b5d2c..ac61d8fc0513 100755
--- a/testautomation/graphics/tools/id_tools.inc
+++ b/testautomation/graphics/tools/id_tools.inc
@@ -979,6 +979,7 @@ function fGetSlideNumber (optional sCompare as integer) as integer
         printlog "If Navigator is not open, opening it now."
         ViewNavigator
     endif
+    WaitSlot (2000)
     printlog "Getting current slide number from navigator."
     fGetSlideNumber = val (right (Liste.GetSelText, 1))
     printlog "fGetSlideNumber has the value " & fGetSlideNumber