CWS-TOOLING: integrate CWS automationdev300m87

3 files changed, 20 insertions, 27 deletions

diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc
index 8cd43ccbcbae..1fc2001e78bb 100644
--- a/testautomation/writer/required/includes/w_001_.inc
+++ b/testautomation/writer/required/includes/w_001_.inc
@@ -773,9 +773,7 @@ testcase tFileSaveAsExport
     Call hNewDocument
 
     PrintLog "Open document '..\writer\required\input\st1_1.sxw"
-    Call hFileOpen(xExport)
-
-    Call sMakeReadOnlyDocumentEditable
+    Call hFileOpenLocally(xExport)
 
     PrintLog "Select Save as .. and choose 'Microsoft Word 97/2000/XP' as export-filter"
     xExportFile = gOfficepath + "user\work\ecksport.doc"
@@ -1029,7 +1027,7 @@ testcase tFileReload
     Wait (500)
 
     PrintLog "Open previous saved document"
-    Call hFileOpen ( gOfficePath + "user\work\" + sFile$ )
+    hFileOpen(  gOfficePath + "user\work\" + sFile$ )
     PrintLog "Insert a table in document"
     Call hTabelleEinfuegen
     PrintLog "File / Reload"
diff --git a/testautomation/writer/required/includes/w_001b_.inc b/testautomation/writer/required/includes/w_001b_.inc
index e20d497482f0..297d04b579bb 100644
--- a/testautomation/writer/required/includes/w_001b_.inc
+++ b/testautomation/writer/required/includes/w_001b_.inc
@@ -125,7 +125,7 @@ testcase tFileSendOutlineToPresentation
         goto endsub
     end select
     PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )"
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile$ )
     Kontext "Navigator"
     if Navigator.Exists then Navigator.Close
     Sleep 1
@@ -176,7 +176,7 @@ testcase tFileSendOutlineToClipboard
     end select
 
     PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )"
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile$ )
     Sleep 1
     PrintLog "File / Send / Outline to Clipboard"
     try
@@ -223,7 +223,7 @@ testcase tFileSendCreateAutoabstract
     end select
 
     PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )"
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile$ )
     Kontext "Navigator"
     if Navigator.Exists then Navigator.Close
     Sleep 1
@@ -274,7 +274,7 @@ testcase tFileSendAutoabstractToPresentation
     end select
 
     PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )"
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile$ )
     Kontext "Navigator"
     if Navigator.Exists then Navigator.Close
     Sleep 1
@@ -399,7 +399,7 @@ testcase tMasterDocFileSaveWithPassword
     FileClose
     WaitSlot(2000)
     PrintLog "Open previous saved document"
-    Call hFileOpen(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"
-    Call hFileOpen(Datei$)
+    Call hFileOpen( Datei$)
     PrintLog "Enter your password in password dialog"
     Kontext "PasswordFileOpen"
     if PasswordFileOpen.Exists then
@@ -468,7 +468,7 @@ testcase tMasterDocFileSaveWithPassword
             Sleep 1
             FileClose
             PrintLog "File / Close and open your document again"
-            Call hFileOpen(Datei$)
+            hFileOpen( Datei$)
             Sleep 1
             Kontext "PasswordFileOpen"
             PrintLog "Now the passwort dialog should come up"
@@ -517,7 +517,7 @@ testcase tMasterDocFileReload
     endif
 
     PrintLog "Open previous saved document"
-    Call hFileOpen ( sDocumentPath )
+    Call hFileOpen(  sDocumentPath )
     
     PrintLog "Insert a table in document"
     Call hTabelleEinfuegen
@@ -652,7 +652,7 @@ testcase tMasterDocFileSendOutlineToPresentation
 
     gApplication = "MASTERDOCUMENT"
 
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile )
     
     Kontext "Navigator"
     if ( Navigator.Exists ) then 
@@ -698,7 +698,7 @@ testcase tMasterDocFileSendOutlineToClipboard
     Dim sFile as string : sFile = "htmltest.sxg"
 
     PrintLog "- File / Send / Outline to Clipboard"
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile )
     
     PrintLog "File / Send / Outline to Clipboard"
     try
@@ -738,7 +738,7 @@ testcase tMasterDocFileSendCreateAutoabstract
     Dim sFile as string : sFile = "htmltest.sxg"
 
     PrintLog "- File / Send / Create Autoabstract"
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile )
     
     Kontext "Navigator"
     hCloseDialog( Navigator, "Close,optional" )
@@ -788,7 +788,7 @@ testcase tMasterDocFileSendAutoabstractToPresentation
     
     PrintLog "- File / Send / Autoabstract to Presentation"
     PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )"
-    Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile )
+    hFileOpenLocally(  gTesttoolPath + "writer\required\input\" + sFile )
     
     Kontext "Navigator"
     hCloseDialog( Navigator, "Close,optional" )
diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc
index 94fa0d70f9f9..20b468c9605c 100644
--- a/testautomation/writer/required/includes/w_007_.inc
+++ b/testautomation/writer/required/includes/w_007_.inc
@@ -84,8 +84,7 @@ testcase tToolsSpellcheck
         Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer."
         goto endsub
     end if
-    hFileOpen ( TheFile )
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( TheFile )
 
     printlog " Insert some faulty text"
     select case iSprache
@@ -246,8 +245,7 @@ testcase tToolsThesaurus
         Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer."
         goto endsub
     end if
-    call hFileOpen( TheFile )
-    Call sMakeReadOnlyDocumentEditable
+    call hFileOpenLocally( TheFile )
 
     printlog " Insert some faulty text"
     select case iSprache
@@ -337,7 +335,7 @@ testcase tToolsHyphenation
 
     Select Case gApplication
     Case "WRITER"
-        hFileOpen( DieDatei )
+        hFileOpenLocally( DieDatei )
 
     Case "MASTERDOCUMENT"
         if wInsertDocumentinMasterDoc(DieDatei) = False then
@@ -354,7 +352,6 @@ testcase tToolsHyphenation
         goto endsub
     end select
 
-    Call sMakeReadOnlyDocumentEditable
     printlog " Insert file 'writer\required\input\linguistik\0 + [OfficeLanguage] + '.odt'"
     Sleep 1
     Call wTypeKeys ("<Mod1 Home>")
@@ -986,8 +983,7 @@ testcase tToolsHangulHanjaConversion
     bAsianLanguage = ActiveDeactivateAsianSupport(TRUE)
 
     printlog " Open the test file"
-    hFileOpen (sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally(sTestFile)
     Call wTypeKeys("<MOD1 Home>")
 
     printlog " Tools / HangulHanjaConversion"
@@ -1126,8 +1122,7 @@ testcase tHtmlDocToolsHangulHanjaConversion
     bAsianLanguage = ActiveDeactivateAsianSupport(TRUE)
 
     printlog " Open the test file"
-    hFileOpen (sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally(sTestFile)
     Call wTypeKeys("<MOD1 Home>")
 
     printlog " Tools / HangulHanjaConversion"
@@ -1238,7 +1233,7 @@ testcase tMasterDocToolsHyphenation
         hUseAsyncSlot( "EditPaste" )
     end if
 
-    Call sMakeReadOnlyDocumentEditable
+    
     printlog " Insert file 'writer\required\input\linguistik\0 + [OfficeLanguage] + '.odt'"
     Sleep 1
     Call wTypeKeys ("<Mod1 Home>")