Adjusting tests for renaissance2 changes

6 files changed, 17 insertions, 8 deletions

diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc
index 55dec0008ac1..8c729871cbb3 100644
--- a/testautomation/graphics/required/includes/global/id_002.inc
+++ b/testautomation/graphics/required/includes/global/id_002.inc
@@ -232,7 +232,7 @@ testcase tiEditFields
 
     hTypeKeys "<ESCAPE>"
     printlog "With a Tab we catch always the Object"
-    hTypeKeys "<Tab>"                  
+    hTypeKeys "<Tab>",3
     printlog "Here we enter Edit-Mode and therefore also the right place"
     hTypeKeys "<F2>"
     printlog "Here we enter Edit-Mode and therefore also the right place"
@@ -406,7 +406,7 @@ testcase tiEditObjectProperties
     gMouseDoubleClick 1,1
 
     printlog " select frame "
-    hTypekeys "<tab>"
+    hTypekeys "<tab>",3
 
     printlog " Edit->Object->Properties "
     kontext
@@ -448,7 +448,7 @@ testcase tiEditObjectEdit
     gMouseClick 20,1
 
     printlog " select object "
-    hTypekeys "<tab>"
+    hTypekeys "<tab>",3
 
     printlog " Edit->Object->Edit "
     EditObjectEdit
@@ -464,7 +464,7 @@ testcase tiEditObjectEdit
     endcatch
 
     printlog " select object "
-    EditSelectAll
+    hTypekeys "<tab>",3
 
     printlog " Edit->Object->Save Copy As "
     EditObjectSaveCopyAs
@@ -531,6 +531,7 @@ testcase tiEditHyperlink
 
     printlog " open application"
     hNewDocument
+    Call sSelectEmptyLayout
     printlog " Insert->Hyperlink"
     InsertHyperlink
     WaitSlot (5000)
@@ -555,7 +556,9 @@ testcase tiEditHyperlink
         Uebernehmen.Click
         Hyperlink.Close
         printlog " presupposition to enable edit->hyperlink: <TAB><F2><STRG+a>"
-        hTypeKeys "<TAB><F2>"
+        hTypeKeys "<TAB>"
+        hTypeKeys "<F2>"
+        hTypeKeys "<MOD1 SHIFT RIGHT>"
     EditSelectAll
     try
         printlog " Edit->Hyperlink "
diff --git a/testautomation/graphics/required/includes/global/id_005.inc b/testautomation/graphics/required/includes/global/id_005.inc
index 8b19fd601948..654f0eac829f 100644
--- a/testautomation/graphics/required/includes/global/id_005.inc
+++ b/testautomation/graphics/required/includes/global/id_005.inc
@@ -960,6 +960,7 @@ testcase tiFormatGroup
 
     printlog "open application"
     Call hNewDocument
+    Call sSelectEmptyLayout
     printlog "create 2 rectangles"
     hRechteckErstellen ( 10, 10, 20, 20 )
     hRechteckErstellen ( 30, 30, 40, 40 )
diff --git a/testautomation/graphics/required/includes/global/id_007.inc b/testautomation/graphics/required/includes/global/id_007.inc
index 3c4c3ca5b08b..242a87f1fce4 100644
--- a/testautomation/graphics/required/includes/global/id_007.inc
+++ b/testautomation/graphics/required/includes/global/id_007.inc
@@ -360,6 +360,7 @@ testcase tdContextDistribution
     Call hNewDocument
     WaitSlot (3000)
     '/// create 3 rectangles ///'
+    Call sSelectEmptyLayout
     Call hRechteckErstellen (20,20,30,30)
     Call hRechteckErstellen (40,40,50,50)
     Call hRechteckErstellen (60,60,70,70)
@@ -430,7 +431,7 @@ testcase tdContextNameObject
     Call hRechteckErstellen ( 30, 40, 50, 60 )
     sleep 1
     '/// select both by spanning a selection with the mouse ///'
-    gMouseMove 1,1,95,95
+    gMouseMove 1,1,70,70
     sleep 1
     '/// Modify->Group ///'
     '///+ Modify->Group ///'
@@ -455,6 +456,7 @@ endcase
 testcase tdModifyConnectBreak
     '/// open application ///'
     Call hNewDocument
+    Call sSelectEmptyLayout
     sleep 1
     '/// create two rectangles ///'
     Call hRechteckErstellen (10,10,30,30)
@@ -483,6 +485,7 @@ endcase
 testcase tdModifyShapes
     '/// open application ///'
     Call hNewDocument
+    Call sSelectEmptyLayout
     sleep 1
     '/// create two rectangles ///'
     gMouseClick 50,50
@@ -551,6 +554,7 @@ endcase
 testcase tdModifyCombineSplit
     '/// open application ///'
     Call hNewDocument
+    Call sSelectEmptyLayout
     sleep 1
     '/// create two rectangles ///'
     Call hRechteckErstellen (30,30,50,50)
diff --git a/testautomation/graphics/required/includes/global/id_011.inc b/testautomation/graphics/required/includes/global/id_011.inc
index 0cc7f22708ab..98d574c0f78c 100644
--- a/testautomation/graphics/required/includes/global/id_011.inc
+++ b/testautomation/graphics/required/includes/global/id_011.inc
@@ -45,6 +45,7 @@ testcase tiTextToolbar
 
     '/// open application ///'
     Call hNewDocument
+    Call sSelectEmptyLayout
 
     '/// create a textframe with text ///'
     hTextrahmenErstellen ("This is a Text, which will be formatted in several ways", 20,20,40,80)
diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc
index a19a8f27b089..0f0b4bdb9069 100644
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -557,7 +557,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
     ExitRestartTheOffice
     printlog "opening new doc to get the Options"
     Call hNewDocument
-    hTypeKeys "OpenNewDoc!"
+    
     printlog "checking states"
     ToolsOptions
     hToolsOptions (sApplication,"Grid")
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index 280dae56b1d1..da2f09187694 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -227,7 +227,7 @@ testcase tiViewToolbar_1
     end if
     Kontext "DocumentImpress"
     printlog "select graphic "
-    EditSelectAll
+    hTypeKeys "<TAB>", 3
     sleep 2
     Kontext "GraphicObjectbar"
     sleep 1