2 files changed, 18 insertions, 18 deletions
diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc
index 1c86e8f01a47..73de7ba6edeb 100644..100755
--- a/testautomation/writer/required/includes/w_002_.inc
+++ b/testautomation/writer/required/includes/w_002_.inc
@@ -658,7 +658,7 @@ endcase
 '---------------------------------------------------
 
 testcase tEditAutotext
-    Dim k as integer
+    Dim j as integer
     Dim i as integer
     Dim CurrentEntryNr as integer
     Dim unxAutotextCategorie as integer
@@ -678,6 +678,7 @@ testcase tEditAutotext
     end if
 
     PrintLog "Click Categories"
+    Kontext "Autotext"
     Bereiche.Click
     Sleep 1    
     Kontext "BereicheBearbeitenAutoText"
@@ -880,8 +881,7 @@ testcase tEditAutotext
         if GetDocumentCount = 1 then
             Warnlog "The autotext has been edited in current document!"
         else
-            hUseAsyncSlot( "FileClose" )
-            
+            hUseAsyncSlot( "FileClose" )            
             Kontext "Active"
             PrintLog "A message that module has been changed should come up"
             if Active.Exists then
@@ -890,11 +890,6 @@ testcase tEditAutotext
                 Warnlog "Though changing the text module the document could be closed without a query!"
             end if
         end if
-        if wDeleteAutotext("DummyAutotext") = false then
-            Warnlog "Unable to delete created autotext"
-        end if
-        Kontext "Autotext"
-        if Autotext.Exists then Autotext.Close
     catch
         Warnlog "Menu Autotext->'Edit' disabled !"
         Kontext "Active"
@@ -908,16 +903,17 @@ testcase tEditAutotext
                 endcatch
             end if
         end if
-        Kontext "Autotext"
-        PrintLog "Close 'Autotext' dialog"
-        Autotext.Close
-        if wDeleteAutotext("DummyAutotext") = false then
-            Warnlog "Unable to delete created autotext"
-        end if
-        Kontext "Autotext"
-        if Autotext.Exists then Autotext.Close
     endcatch
 
+    PrintLog "Close 'Autotext' dialog"
+    Kontext "Autotext"
+    if Autotext.Exists then Autotext.Close
+    if wDeleteAutotext("DummyAutotext") = false then
+        Warnlog "Unable to delete created autotext"
+    end if
+    Kontext "Autotext"
+    if Autotext.Exists then Autotext.Close
+
     PrintLog "Close active document"
     Call hCloseDocument
 endcase
diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc
index 754d4c58e538..61a20821349f 100644..100755
--- a/testautomation/writer/required/includes/w_011_.inc
+++ b/testautomation/writer/required/includes/w_011_.inc
@@ -411,7 +411,9 @@ testcase tZOArea
     Call hNewDocument
     printlog "Insert a draw object ( rectangle )"
     Call wZeichenobjektEinfuegen ( "Rechteck", 30, 30, 50, 60 )
-    Call gMouseClick ( 25, 25 )
+    ' Set focus to document
+    Call gMouseMove2 ( 50, 25 )
+    Call gMouseClick ( 50, 25 )
     printlog "Select drawing object with shortcut 'Shift F4'"
     Call wTypeKeys ( "<Shift F4>" )
 
@@ -452,6 +454,8 @@ testcase tZORest
     Call hNewDocument
     printlog "Insert a draw object ( rectangle )"
     Call wZeichenobjektEinfuegen ( "Rechteck", 30, 30, 50, 60 )
+    ' Set focus to document
+    Call gMouseMove2 ( 50, 25 )
     Call gMouseClick ( 50, 25 )
     printlog "Select drawing object with shortcut 'Shift F4'"
     Call wTypeKeys ( "<Shift F4>" )
@@ -464,7 +468,7 @@ testcase tZORest
         Drehen.Click
         wait 500
     catch
-        Warnlog "#i56594#Shortcut selecting objects doesn't work"
+        Warnlog "Shortcut selecting objects doesn't work"
         Call hCloseDocument
         goto endsub
     endcatch