dba34a: merged in CWS dba33i

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

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

testautomation/graphics/required/includes/impress/im_003_.inc

@@ -217,11 +217,9 @@ testcase tiViewToolbar_1
 
     printlog "open application "
     Call hNewDocument
-    Call sSelectEmptyLayout
-    printlog "delete default content"
-    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" )

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"