Merge remote branch 'origin/libreoffice-3-3'

testautomation/dbaccess/tools/querytools.inc

@@ -258,10 +258,7 @@ function fSaveQueryDesign(sName as String)
     
     sleep(1)
     Kontext "QueryDesignTable"
-        QueryDesignTable.UseMenu
-        
-        hMenuSelectNr(1) ' the file menu
-        hMenuSelectNr(6) ' the save
+        DatabaseSave
                 
     Kontext "DatabaseTableSaveAs"
         TableName.setText(sName)
@@ -278,11 +275,9 @@ function fSaveSQLQueryDesign(sName as String)
     '/// <u>parameter:</u>  the name of query   
     
     sleep(1)
+
     Kontext "QueryEditWindow"
-        QueryEditWindow.UseMenu
-        
-        hMenuSelectNr(1) ' the file menu
-        hMenuSelectNr(6) ' the save
+        DatabaseSaveAs
                 
     Kontext "DatabaseTableSaveAs"
         TableName.setText(sName)

testautomation/dbaccess/tools/tabletools.inc

@@ -342,13 +342,12 @@ function fCreateTable(aFieldTypeContent(),sTableName,optional sCatalog,optional
         Description.TypeKeys "<RETURN>" , TRUE
         printlog "-------------------------------"
     next 
+
     sleep(1)    
+
     Kontext "TableDesignTable"         
-        TableDesignTable.usemenu
-        MenuSelect MenuGetItemId (1)
-        sleep(1)
-        menuselect MenuGetItemId (7)
-        sleep(1)	
+        DatabaseSaveas
+
     Kontext "DatabaseTableSaveAs"
         printlog "save table as "+ sTableName
         TableName.setText sTableName

testautomation/global/sid/e_all.sid

@@ -35,6 +35,7 @@ FileSendDocumentAsPDF SID_MAIL_SENDDOCASPDF
 FileVersions SID_VERSION
 FileReload SID_RELOAD SID_LASTVERSIONDOC
 FileProperties SID_DOCINFO
+FileDigitalSignatures .uno:Signature
 FileTemplatesOrganize SID_ORGANIZER
 FileTemplatesSave SID_DOCTEMPLATE
 FileTemplatesEdit SID_OPENTEMPLATE
@@ -789,7 +790,7 @@ SlideShowAnimation .uno:CustomAnimation
 SlideShowSlideTransition .uno:SlideChangeWindow
 SlideShowHideSlide SID_HIDE_SLIDE
 SlideShowShowSlide SID_SHOW_SLIDE 
-SlideShowCustomSlideshow SID_CUSTOMSHOW_DLG
+SlideShowCustomSlideshow .uno:CustomShowDialog
 SlideShowCustomAnimation .uno:CustomAnimation
 
 ' ***********************************

testautomation/global/tools/includes/optional/t_security_tools.inc

@@ -144,17 +144,8 @@ function hOpenDigitalSignaturesDialog() as boolean
     '///+<li>Open the file-menu</li>
     call hUseMenu()
     call hMenuSelectNr( FILE_MENU_POSITION )
-                                                                                
-    '///+<li>Select &quot;Digital signatures...&quot;</li>
-    try
-        if ( gApplication = "MATH" ) then
-            call hMenuSelectNr( SIGNATURES_MENU_POSITION_MATH )
-        else
-            call hMenuSelectNr( SIGNATURES_MENU_POSITION_OTHER )
-        endif
-    catch
-        warnlog( CFN & "Failed to execute menuitem <Digital Signature...>" )
-    endcatch
+
+    FileDigitalSignatures
 
     ' At this stage either the digital signatures dialog or the messagebox
     ' <The document needs to be saved> is open. In the latter case the function

testautomation/graphics/optional/includes/global/export_graphic_2.inc

@@ -613,38 +613,6 @@ testcase tSVG
         '------------------------\
         if ( dir(OutputGrafikTBO+sExt) <> "") then
             Printlog "Ok :-) Saved as: '" & OutputGrafikTBO+sExt & "'"
-            '------------------------\
-            if (iSprache <> 82) then
-                hCloseDocument ()
-                sleep 5
-                sTextFilter = "Text"
-
-                hFileOpenWithFilter (OutputGrafikTBO+sExt, sTextFiltername, FALSE)
-                printlog "if dialog 'AsciiFilterOptionen' comes up, say OK"
-                Kontext "AsciiFilterOptionen"
-                '-------------------------------\
-                If AsciiFilterOptionen.Exists(3) then
-                    AsciiFilterOptionen.OK
-                else
-                    warnlog "No ASCII filter Options Dialog?"
-                endif
-                '-------------------------------/
-                sTemp = gApplication
-                gApplication = "WRITER"
-                sleep 5 ' wait for document to be loaded
-                bTemp = hFindeImDokument ("<!DOCTYPE svg PUBLIC " & chr(34)& "-//W3C//DTD SVG 1.1//EN" & chr(34)&" " & chr(34)&"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" & chr(34)&">",true)
-                '-------------------------------\
-                if (bTemp = TRUE) then
-                    Printlog "OK"
-                else
-                    warnlog "DOCTYPE not found in svg file :-("
-                endif
-                '-------------------------------/
-                gApplication = sTemp
-            else
-                qaerrorlog "disabled for 82: #111017#"
-            endif
-            '--------------------------/
         else
             warnlog "File didn't get saved :-("
         endif

testautomation/graphics/optional/includes/impress/i_slideshow2.inc

@@ -909,7 +909,7 @@ testcase tSlideshowBackgroundAllSlides
     Dim Background$ as string
     Dim i as integer
     Dim Zaehler as integer
-    Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
+    Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\www-back\chocolate.jpg")
     Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
 
     '/// Create a new document ///'
@@ -962,7 +962,7 @@ testcase tSlideshowBackgroundSelectedSlide
     Dim Background$ as string
     Dim i as integer
     Dim Zaehler as integer
-    Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
+    Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\www-back\chocolate.jpg")
     Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
 
     '/// Create a new document ///'

testautomation/graphics/optional/includes/impress/i_slideshow3.inc

@@ -582,7 +582,7 @@ testcase tExtrasIndividuellePraesentation
       Kontext "NavigatorDraw"
       Naechste.Click						'/// switch to next slide ///'
       Kontext "DocumentImpress"
-      hRechteckErstellen (50,50,60,60)		'/// create rectangle ///'
+      hRechteckErstellen (30,30,40,40)		'/// create rectangle ///'
       Printlog "  - Created rectangles on all slides"
    else
       Warnlog "  No Navigator"