automationdev300m87: Local branch merge

3 files changed, 18 insertions, 20 deletions

diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc
index 43b16a2878a0..25a762297df7 100644
--- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc
+++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc
@@ -53,7 +53,7 @@ end sub
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_1
+testcase tGroup_1
 
     PrintLog "- Generate a objects group via menu Format/Group/Group"
 
@@ -80,7 +80,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_2
+testcase tGroup_2
 
     PrintLog "- Generate a objects group via contextmenu Format/Group/Group"
 
@@ -109,7 +109,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_3
+testcase tGroup_3
 
     PrintLog "- Menu entries may not be enabled if less then two objects are selected."
 
@@ -138,7 +138,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_4
+testcase tGroup_4
 
     Dim sGroupName as String
 
@@ -193,7 +193,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_5
+testcase tGroup_5
 
     Dim sGroupName as String
 
@@ -248,7 +248,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_6
+testcase tGroup_6
 
     Dim sPositionX1 as String
     Dim sPositionY1 as String
@@ -317,7 +317,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_7
+testcase tGroup_7
 
     Dim sPositionX1 as String
     Dim sPositionY1 as String
@@ -388,7 +388,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_8
+testcase tGroup_8
 
     Dim sPositionX as String
     Dim sPositionY as String
@@ -445,7 +445,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_9
+testcase tGroup_9
 
     Dim sPositionX as String
     Dim sPositionY as String
@@ -507,7 +507,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_10
+testcase tGroup_10
 
     PrintLog "- create new objects inside the group ,"
     PrintLog "  Undo new created objects before leaving the group"
@@ -554,7 +554,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_11
+testcase tGroup_11
 
     PrintLog "- create new objects inside the group ,"
     PrintLog "  Undo new created objects after leaving the group"
@@ -603,7 +603,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_12
+testcase tGroup_12
 
     Dim sDocument as String
 
@@ -636,7 +636,7 @@ testcase  tGroup_12
     Call hCloseDocument
     
       PrintLog "- Open previous saved document "
-    hFileOpenLocally( sDocument)
+    Call hFileOpen( sDocument)
     
     Kontext "DocumentWriter"
     Call gMouseClick(34,34)    'set focus in the group
@@ -655,7 +655,7 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase  tEncapsulatedGroup_1
+testcase tEncapsulatedGroup_1
 
     PrintLog "- Group objects inside the group ,Encapsulated Group"
     
diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc
index 163aa230f2e1..e5fe3b4f267f 100644
--- a/testautomation/writer/optional/includes/regexp/search.inc
+++ b/testautomation/writer/optional/includes/regexp/search.inc
@@ -64,10 +64,8 @@ end sub
 
 '---------------------------------------------------------
 testcase tCheckDialog
-    warnlog( "#i111908# - Control <Replace> cannot be accessed" )
-    goto endsub
     
- Dim Checkboxtitel
+    Dim Checkboxtitel
    Call hNewDocument
    EditSearchAndReplace
    Sleep 2
diff --git a/testautomation/writer/required/includes/w_001b_.inc b/testautomation/writer/required/includes/w_001b_.inc
index 992396377ba4..a48023ea73d0 100644
--- a/testautomation/writer/required/includes/w_001b_.inc
+++ b/testautomation/writer/required/includes/w_001b_.inc
@@ -399,7 +399,7 @@ testcase tMasterDocFileSaveWithPassword
     FileClose
     WaitSlot(2000)
     PrintLog "Open previous saved document"
-    hFileOpenLocally( Datei$)
+    Call hFileOpen( Datei$)
 
     Kontext "PasswordFileOpen"
     PrintLog "Enter a wrong password."
@@ -427,7 +427,7 @@ testcase tMasterDocFileSaveWithPassword
 
     Sleep 1
     PrintLog "File / Open again your previous saved document"
-    hFileOpenLocally( Datei$)
+    Call hFileOpen( Datei$)
     PrintLog "Enter your password in password dialog"
     Kontext "PasswordFileOpen"
     if PasswordFileOpen.Exists then
@@ -517,7 +517,7 @@ testcase tMasterDocFileReload
     endif
 
     PrintLog "Open previous saved document"
-    hFileOpenLocally(  sDocumentPath )
+    Call hFileOpen(  sDocumentPath )
     
     PrintLog "Insert a table in document"
     Call hTabelleEinfuegen