automationdev300m84: Local merge

5 files changed, 18 insertions, 9 deletions

diff --git a/testautomation/chart2/optional/includes/ch2_datadialogue.inc b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
index fd7876057db5..f7e4078ad911 100644
--- a/testautomation/chart2/optional/includes/ch2_datadialogue.inc
+++ b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
@@ -286,9 +286,6 @@ testcase tChartDataDialogueFieldsUndo
         DatabaseUndo
         '/// And then we enter the dialogue again, to check if the values has returned to what they were before we changed them.
         printlog "And then we enter the dialogue again, to check if the values has returned to what they were before we changed them."
-        '/// One press on 'TAB' to select the object ///'
-        printlog "   Click the button 'TAB', to select the object."
-        DocumentImpress.TypeKeys "<TAB>"
         '/// Followed by one press on "RETURN" / "ENTER" to enter the Chart-Data-dialogue  ///'
         printlog "   Click the button 'Return', to enter the Chart-Data-dialogue."
         DocumentImpress.TypeKeys "<RETURN>"
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index b8e3ccc2d896..52579da2e15b 100755
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -58,7 +58,9 @@ testcase tLoadForm
 	FM_FormFilter_Start
 	wait(1000)
     '/// insert 2 in the first textbox
-    printlog "insert 2 in the first textbox"    
+    printlog "insert 2 in the first textbox"
+        DocumentWriter.TypeKeys "<MOD1 F5>" , true
+        sleep(1)
 	DocumentWriter.TypeKeys "2" , true
 	'DocumentWriter.TypeKeys "<RETURN>" , true
 	wait(1000)
@@ -91,7 +93,11 @@ testcase tLoadForm
 	FM_FormFilter_Start
 	wait(1000)
     '/// insert into the second textbox like '%2'
-    printlog "insert into the second textbox like '%2'"    
+    printlog "insert into the second textbox like '%2'"
+        DocumentWriter.TypeKeys "<MOD1 F5>" , true
+	sleep(1)
+        DocumentWriter.TypeKeys "<TAB>" , true
+	sleep(1)
 	DocumentWriter.TypeKeys "like '%2'" , true
 	wait(1000)
     '/// execute the filter
diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
index 32eee7e6040c..ad543b5c97f7 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
@@ -355,6 +355,11 @@ endcase
 '-----------------------------------------------------------
 
 testcase tFileRecentDocuments
+
+if gPlatform = "lin" then
+    warnlog "#110649# Due to bug this testcase is not available"
+    goto endsub
+end if
     
     dim sTestFile as string
       
diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc
index 4023480ff7dd..422be7088a14 100755
--- a/testautomation/writer/optional/includes/fields/w_fields2.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields2.inc
@@ -879,7 +879,7 @@ testcase tDocumentStatistics
     ' document has to be copied to local file system to avoid opening a read-only file
     ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable'
     FileCopy (sOriginalFile, sTestFile)
-    if hFileExists ( sTestFile ) = false then
+    if FileExists ( sTestFile ) = false then
         Warnlog "Test document couldn't be copied to local file system. Test aborted!"
         goto endsub
     end if
@@ -942,7 +942,7 @@ testcase tDocumentTemplate
     ' document has to be copied to local file system to avoid opening a read-only file
     ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable'
     FileCopy (sOriginalFile, sTestFile)
-    if hFileExists ( sTestFile ) = false then
+    if FileExists ( sTestFile ) = false then
         Warnlog "Test document couldn't be copied to local file system. Test aborted!"
         goto endsub
     end if
diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
index 07c0dc4628d0..a8e5565e5eba 100755
--- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
+++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
@@ -43,6 +43,7 @@ sub w_spellcheck
     Call tToolsThesaurus
     Call tToolsSpellcheckButtonChange
     Call tToolsSpellcheckButtonChangeAll
+    Call tToolsThesaurusSynonyms
 
 end sub
 
@@ -1286,7 +1287,7 @@ testcase tToolsThesaurus
     printlog "Set language dependent word in textfield Current Word"
     CurrentWord.Settext sWordInitial
 
-    wait 500
+    Sleep 2
     if Alternatives.GetItemCount = 0 then
         Warnlog "No alternatives text"
     else
@@ -1390,7 +1391,7 @@ testcase tToolsThesaurusSynonyms
 
     printlog " Open document where the formatting is set to the language we wish to test."
     TheFile = Convertpath (gTesttoolpath + "writer\optional\input\spellcheck\spellcheck_" + iSprache + ".odt")
-    if hFileExists ( TheFile ) <> TRUE then
+    if FileExists ( TheFile ) <> TRUE then
        Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer."
        exit sub
     end if