6 files changed, 23 insertions, 9 deletions
diff --git a/testautomation/writer/tools/includes/w_locale_strings2.inc b/testautomation/writer/tools/includes/w_locale_strings2.inc
index 354bcc44b936..354bcc44b936 100755..100644
--- a/testautomation/writer/tools/includes/w_locale_strings2.inc
+++ b/testautomation/writer/tools/includes/w_locale_strings2.inc
diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc
index a39fa5773102..a39fa5773102 100755..100644
--- a/testautomation/writer/tools/includes/w_tool1.inc
+++ b/testautomation/writer/tools/includes/w_tool1.inc
diff --git a/testautomation/writer/tools/includes/w_tool3.inc b/testautomation/writer/tools/includes/w_tool3.inc
index 16fd825f6447..5aa58e2f967c 100755..100644
--- a/testautomation/writer/tools/includes/w_tool3.inc
+++ b/testautomation/writer/tools/includes/w_tool3.inc
@@ -270,7 +270,7 @@ sub UndoRichtigBeiSortierung
     if Fehler = TRUE then
         Warnlog "Undo after sorting has not been functioned correctly"
         Call hCloseDocument
-        Call hFileOpen ( gTesttoolPath + "writer\optional\input\st1_5.sdw" )
+        hFileOpenLocally(  gTesttoolPath + "writer\optional\input\st1_5.sdw" )
     end if
     Call wTypeKeys "<End>"
     Call wTypeKeys "<Down>",6
diff --git a/testautomation/writer/tools/includes/w_tool4.inc b/testautomation/writer/tools/includes/w_tool4.inc
index c2133c1ff4bc..c2133c1ff4bc 100755..100644
--- a/testautomation/writer/tools/includes/w_tool4.inc
+++ b/testautomation/writer/tools/includes/w_tool4.inc
diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc
index 33ddca87709e..9bc7ed688d9b 100755..100644
--- a/testautomation/writer/tools/includes/w_tool6.inc
+++ b/testautomation/writer/tools/includes/w_tool6.inc
@@ -38,6 +38,10 @@ sub wOfficeRestart
     FileExit "SynchronMode", TRUE
 
     Call hStartTheOffice
+
+    ' Open new document
+    Call hNewDocument
+
 end sub
 
 '--------------------------------------------------------------
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc
index 27b9526bb0de..cfe0aa6e07f3 100755
--- a/testautomation/writer/tools/includes/w_tools.inc
+++ b/testautomation/writer/tools/includes/w_tools.inc
@@ -141,11 +141,14 @@ end function
 
 ' -----------------------------------------------------------------------
 
-sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean )
+sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean, optional bLeaveSelected as boolean )
 
     Kontext "DrawBar"
     if Not DrawBar.Exists then Call hToolbarSelect("Drawing", true)
     Sleep 2
+    if IsMissing(bLeaveSelected) then
+        bLeaveSelected = false
+    endif
 
     Objekt = UCase( Objekt )
     select case Objekt
@@ -187,8 +190,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
         end if
         if Objekt <> "TEXT" and Objekt <> "VTEXT" then
             Kontext "DocumentWriter"
-            Call gMouseClick (10, 10)
-            wait 100
+            if bLeaveSelected = false then
+                Call gMouseClick (10, 10)
+                wait 100
+            endif
         end if
 
     Case "MASTERDOCUMENT"
@@ -205,8 +210,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
         end if
         if Objekt <> "TEXT" and Objekt <> "VTEXT" then
             Kontext "DocumentMasterDoc"
-            Call gMouseClick (10, 10)
-            wait 100
+            if bLeaveSelected = false then
+                Call gMouseClick (10, 10)
+                wait 100
+            endif
         end if
     end select
     sleep (1)
@@ -215,18 +222,21 @@ end sub
 ' -----------------------------------------------------------------------
 
 sub wObjektSelektieren ( xStart%, yStart%, xEnde%, yEnde% )
-    '    Call gMouseClick(90,90)
     Call hToolbarSelect("DRAWING",true)
-    Auswahl.Click
+    if Auswahl.Getstate(2) = 0 then
+        Auswahl.Click
+    endif
     Select Case gApplication
     Case "WRITER"
         Kontext "DocumentWriter"
         DocumentWriter.MouseDown xStart%, yStart%
+        wait 500
         DocumentWriter.MouseMove xEnde%, yEnde%
         DocumentWriter.MouseUp xEnde%, yEnde%
     Case "MASTERDOCUMENT"
         Kontext "DocumentMasterDoc"
         DocumentMasterDoc.MouseDown xStart%, yStart%
+        wait 500
         DocumentMasterDoc.MouseMove xEnde%, yEnde%
         DocumentMasterDoc.MouseUp xEnde%, yEnde%
     end select
@@ -1042,7 +1052,7 @@ end sub
 
 function wInsertDocumentinMasterDoc(DocumentName as string) as boolean
     Call hNewDocument
-    Call hFileOpen(DocumentName)
+    hFileOpenLocally( DocumentName)
     Sleep 2
     Call wTypeKeys "<Mod1 A>"
     Sleep 2