DEV300: changesets OOO330 up to m8

9 files changed, 60 insertions, 30 deletions

diff --git a/testautomation/dbaccess/optional/includes/db_Mozilla.inc b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
index 45cf9456d290..236b6a5e79ed 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Mozilla.inc
+++ b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
@@ -32,22 +32,35 @@
 '\***********************************************************************
 sub db_Mozilla
 
-    ' Information for this test under
-    ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book
-
-    if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then
-        
-        tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
-        tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
-	else
+    if(gPlatform = "osx") then
+        ' on Mac platform the Mozilla address book is not available
+        ' so I call only the testcases to satisfied the database
         tQueryAddressbook("")
         tSortAddressbook("")
+    else
+    
+        ' Information for this test under
+        ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book
+
+        if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then
+
+            tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
+            tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
+            else
+            tQueryAddressbook("")
+            tSortAddressbook("")
+        endif
     endif
     
 end sub
 '-------------------------------------------------------------------------
 testcase tQueryAddressbook( sFileName )
     
+    if(gPlatform = "osx") then
+        printlog "mozilla address book not available on Mac"
+        goto endsub
+    endif
+
     if ( not fOpenDatabase(sFileName) ) then        
         warnlog "Database can't be open"
         printlog "May be you find a solution under http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book"
@@ -86,6 +99,11 @@ endcase
 '-------------------------------------------------------------------------
 testcase tSortAddressbook( sFileName )
     
+    if(gPlatform = "osx") then
+        printlog "mozilla address book not available on Mac"
+        goto endsub
+    endif
+
     Dim sRecordCount as String
     
     '/// open the database file created in the bas file
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index bdcf1c4bc63b..74edeb1df3aa 100755..100644
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -47,7 +47,9 @@ testcase tLoadForm
 	Kontext "DocumentWriter"
     '/// press CTRL + F5 to get into the first textbox
     printlog "press CTRL + F5 to get into the first textbox"
-	DocumentWriter.TypeKeys "<MOD1 F5>" , true
+	DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
+        DocumentWriter.TypeKeys "<MOD1 F5>" , true
 	'sleep(1)
 	'DocumentWriter.TypeKeys "<MOD1 C>" , true
 	'sleep(1)
@@ -59,6 +61,8 @@ testcase tLoadForm
 	wait(1000)
     '/// insert 2 in the first textbox
     printlog "insert 2 in the first textbox"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
         sleep(1)
 	DocumentWriter.TypeKeys "2" , true
@@ -69,7 +73,7 @@ testcase tLoadForm
 	FM_FF_Execute
 	wait(1000)
     printlog "workaround issue 102010"
-	DocumentWriter.TypeKeys "<MOD1 F6>" , true
+    DocumentWriter.TypeKeys "<MOD1 F6>" , true
     sleep(1)
     DocumentWriter.TypeKeys "<MOD1 F5>" , true   
     sleep(1)
@@ -94,6 +98,8 @@ testcase tLoadForm
 	wait(1000)
     '/// insert into the second textbox like '%2'
     printlog "insert into the second textbox like '%2'"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
 	sleep(1)
         DocumentWriter.TypeKeys "<TAB>" , true
diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc
index b31a064e60ee..630e1920cbce 100755..100644
--- a/testautomation/dbaccess/optional/includes/frm_Forms.inc
+++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc
@@ -173,7 +173,7 @@ testcase tCreateForm
    	'/// insert a textfield
     printlog "insert a textfield"        
     Edit.Click
-   	call hDrawingWithSelection ( 50, 20, 60, 30 )
+   	call hDrawingWithSelection ( 50, 30, 60, 40 )
    	sleep(1)
     
     Kontext "FormControls"
@@ -543,7 +543,7 @@ testcase tCreateSubForms
    	'/// insert a textfield
     printlog "insert a textfield"        
     Edit.Click
-   	call hDrawingWithSelection ( 50, 20, 60, 30 )
+   	call hDrawingWithSelection ( 50, 30, 60, 40 )
    	sleep(1)
     
     Kontext "FormControls"
@@ -638,7 +638,7 @@ testcase tCreateSubForms
        '/// insert a textfield
        printlog "insert a textfield"
        'Edit.Click
-   	 call hDrawingWithSelection ( 50, 40, 60, 50 )
+   	 call hDrawingWithSelection ( 50, 50, 60, 60 )
    	 sleep(1)
     
     Kontext "FormControls"
@@ -672,6 +672,8 @@ testcase tCheckSubForm
     '/// set cursor into the first control
     printlog "set cursor into the first control"   
     Kontext "DocumentWriter"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
         sleep(1)
            
@@ -749,7 +751,7 @@ testcase tCreateSubFormsNewMethod
         '/// insert a textfield
         printlog "insert a textfield"        
         Edit.Click
-        call hDrawingWithSelection ( 50, 20, 60, 30 )
+        call hDrawingWithSelection ( 50, 30, 60, 40 )
         sleep(1)
     
     Kontext "FormControls"
diff --git a/testautomation/dbaccess/optional/includes/rpt_Formating.inc b/testautomation/dbaccess/optional/includes/rpt_Formating.inc
index e2671728b168..4bde542bd176 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_Formating.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_Formating.inc
@@ -62,9 +62,9 @@ testcase tConditionalFormating
         sleep(1)
     
     Kontext "ReportDesign"    
-        ReportDesign.MouseDown ( 30, 50 )            
-        ReportDesign.MouseMove ( 40, 60 )            
-        ReportDesign.MouseUp ( 40, 60 )            
+        ReportDesign.MouseDown ( 30, 40 )
+        ReportDesign.MouseMove ( 40, 50 )
+        ReportDesign.MouseUp ( 40, 50 )
     sleep(1)  
     
     '/// open the conditional formating dialog via the menu
@@ -129,9 +129,9 @@ testcase tGrowAndShrink
         sleep(1)
     
     Kontext "ReportDesign"    
-        ReportDesign.MouseDown ( 30, 50 )            
-        ReportDesign.MouseMove ( 40, 60 )            
-        ReportDesign.MouseUp ( 40, 60 )            
+        ReportDesign.MouseDown ( 30, 40 )
+        ReportDesign.MouseMove ( 40, 50 )
+        ReportDesign.MouseUp ( 40, 50 )
     sleep(1)                        
     
     '/// open the conditional formating dialog via the menu
diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc
index ad24c621b867..05f0da768cdf 100755..100644
--- a/testautomation/dbaccess/optional/includes/xf_Submission.inc
+++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc
@@ -41,6 +41,8 @@ end sub
 '-------------------------------------------------------------------------
 testcase tDataNavigatorSubmission    
     
+    Dim sSubmitPath as string
+
     '/// open new XML Form
     printlog "open new XML Form"
     
@@ -101,11 +103,8 @@ testcase tDataNavigatorSubmission
     '/// add a submission
     Kontext "XFormAddSubmission"
         SubmitName.setText("submission1")
-        if ( gPlatgroup = "w95" ) then
-            SubmitAction.setText("file:///" + ConvertPath(gOfficePath,"lin") + "user/work/test.xml")
-        else
-            SubmitAction.setText("file://" + gOfficePath + "user/work/test.xml")
-        endif
+        sSubmitPath = "file:///" + gOfficePath + "user/work/test.xml"
+        SubmitAction.setText( hStringReplaceChar( sSubmitPath, "\", "/" ) )
         SubmitMethod.select 2            
             
     '/// close the add submission dialog
diff --git a/testautomation/framework/optional/includes/security_certification_dialogs.inc b/testautomation/framework/optional/includes/security_certification_dialogs.inc
index ee7605ad1cce..c367285956ae 100755..100644
--- a/testautomation/framework/optional/includes/security_certification_dialogs.inc
+++ b/testautomation/framework/optional/includes/security_certification_dialogs.inc
@@ -86,7 +86,7 @@ testcase tCertificationDialogs
     kontext "DigitalSignature"
     if ( DigitalSignature.exists( 2 ) ) then
         printlog( CFN & "Digital signatures is open" )
-        DigitalSignature.cancel()
+        DigitalSignature.close()
     else
         if ( gApplication <> "MASTERDOCUMENT" ) then
             warnlog( CFN & "Digital Signatures Dialog is not open" )
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index 6917639d30f8..008248a1c57d 100755
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -196,9 +196,6 @@ end sub
 
 testcase tCheckWindowTitle( sApplication as string, sReference as string )
 
-    if ( sApplication = "soffice" ) then
-
-
     printlog( "Update test for the office window titles" )
 
     ' This is a Testtool-only problem that the product name is not displayed
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index 3c73b7827d21..b8b5a6330f17 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -222,6 +222,9 @@ testcase tiViewToolbar_1
     hUseAsyncSlot( "EditSelectAll" )
     Kontext "DocumentImpress"
     DocumentImpress.typeKeys("<DELETE>",true)
+    
+    printlog "use the empty layout"
+    call sSelectEmptyLayout
 
     printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
     hUseAsyncSlot( "InsertGraphicsFromFile" )
diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
index 7454f733665d..e4871e78f400 100644
--- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
+++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
@@ -52,6 +52,7 @@ testcase tExportAllReadableFormatsIntoODF
     Dim SavedCorrectly as Boolean
 	Dim sExportFilter as string
 	Dim sExportFile as string
+    Dim sExceptionFile as string
     Dim i as Integer
 
     WorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\"))
@@ -77,8 +78,12 @@ testcase tExportAllReadableFormatsIntoODF
 	For i = 1 to listCount(ImportFileList())
 		printlog "- " & i & ". load: " & ImportFileList(i)
 		sExportFile = ImportFileList(i)
+        sExceptionFile  = DateiExtract ( sExportFile )
+        printlog sExceptionFile
 		if GetExtention ( sExportFile ) = "psw" then
-			QAErrorlog "#i102221#Pocket Word filter puts General I/O Error"
+            QAErrorlog "#i102221#Pocket Word filter puts General I/O Error"
+        elseif LCase( sExceptionFile ) = "swdos.txt" then
+            QAErrorlog "#i114062#General I/O error loading StarWriter DOS file"
 		else
 			Call hFileOpen ( ImportFileList(i) )
 			printlog "-  done"