CWS changehid: resync to m89

7 files changed, 28 insertions, 9 deletions

diff --git a/testautomation/graphics/required/includes/impress/i_opt_1_.inc b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
index 148bbe980424..f7f726d94d0e 100644
--- a/testautomation/graphics/required/includes/impress/i_opt_1_.inc
+++ b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/required/includes/impress/im_002_.inc b/testautomation/graphics/required/includes/impress/im_002_.inc
index bd101e4413f4..935175ca010c 100644
--- a/testautomation/graphics/required/includes/impress/im_002_.inc
+++ b/testautomation/graphics/required/includes/impress/im_002_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Required Test Library (2)
 '*
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index a160699d74ca..b8b5a6330f17 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Resource Test: View Menu
 '*
@@ -210,12 +210,21 @@ testcase tiViewToolbar_1
 
     Dim NumberOfGraphicModes as integer
     Dim iCurrentGraphicsMode as integer
-
     dim TestFile as string
+    dim i as integer
+    
     TestFile = ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
 
     printlog "open application "
     Call hNewDocument
+    Call sSelectEmptyLayout
+    printlog "delete default content"
+    hUseAsyncSlot( "EditSelectAll" )
+    Kontext "DocumentImpress"
+    DocumentImpress.typeKeys("<DELETE>",true)
+    
+    printlog "use the empty layout"
+    call sSelectEmptyLayout
 
     printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
     hUseAsyncSlot( "InsertGraphicsFromFile" )
@@ -235,8 +244,17 @@ testcase tiViewToolbar_1
         printlog "select graphic "
         hUseAsyncSlot( "EditSelectAll" )
 
-        Kontext "GraphicObjectbar"
         printlog "The Graphics Toolbar has to be visible now; If not -> ERROR "
+        ' workaround for i113609; there should have been a style selected without elements on creating the document - what failed; the elements should have been deleted before inserting the grafik in this test - which failed; so the workaround is to use <tab> to travel to the graphic selection here:
+        for i=1 to 3
+        Kontext "GraphicObjectbar"
+        if ( not GraphicObjectbar.Exists( DEFAULT_DELAY ) ) Then
+            hTypeKeys("<tab>")
+            qaerrorlog "delete default content failed"
+        end if
+        next i
+
+        Kontext "GraphicObjectbar"
         if ( GraphicObjectbar.Exists( DEFAULT_DELAY ) ) Then
 
             Printlog "- graphic object toolbar exists"
diff --git a/testautomation/graphics/required/includes/impress/im_004_.inc b/testautomation/graphics/required/includes/impress/im_004_.inc
index 28f11a778864..2c55bc4c2f13 100644
--- a/testautomation/graphics/required/includes/impress/im_004_.inc
+++ b/testautomation/graphics/required/includes/impress/im_004_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Required Test Library (4)
 '*
@@ -49,6 +49,7 @@ testcase tiInsertSlideExpandSummary
     Kontext "DocumentImpressOutlineView"
     printlog "Type 2 rows "
     DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi"
+    sleep(1)
     printlog "View->Master View->Drawing View "
     ViewWorkspaceDrawingView
     WaitSlot()
diff --git a/testautomation/graphics/required/includes/impress/im_005_.inc b/testautomation/graphics/required/includes/impress/im_005_.inc
index 5a8b9fb9a518..146d37c0f669 100644
--- a/testautomation/graphics/required/includes/impress/im_005_.inc
+++ b/testautomation/graphics/required/includes/impress/im_005_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Required Test Library (5)
 '*
diff --git a/testautomation/graphics/required/includes/impress/im_007_.inc b/testautomation/graphics/required/includes/impress/im_007_.inc
index 0a598f59c520..68d271e30d7f 100644
--- a/testautomation/graphics/required/includes/impress/im_007_.inc
+++ b/testautomation/graphics/required/includes/impress/im_007_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Required Test Library (7)
 '*
diff --git a/testautomation/graphics/required/includes/impress/im_011_.inc b/testautomation/graphics/required/includes/impress/im_011_.inc
index 084be5223b10..2c505f5facc2 100644
--- a/testautomation/graphics/required/includes/impress/im_011_.inc
+++ b/testautomation/graphics/required/includes/impress/im_011_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Required Test Library (11)
 '*