diff options
| author | Rene Engelhard <rene@debian.org> | 2011-01-02 01:13:29 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2011-01-02 01:13:29 +0100 |
| commit | 60e98e0127a89ba2f195b92939c29eaf87aa5e67 (patch) | |
| tree | 8bcc17ae3fd4bffe9a52c64ad6f624cc87251136 /testautomation/global | |
| parent | ee2aae7d96ba32a5c9c0147b0c39585bc32d2213 (diff) | |
| parent | e2ed81111cfc45b85cb399021189383d0b17c842 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Diffstat (limited to 'testautomation/global')
| -rw-r--r-- | testautomation/global/sid/e_all.sid | 3 | ||||
| -rwxr-xr-x | testautomation/global/tools/includes/optional/t_security_tools.inc | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 4c7800ba8676..d7215aac2200 100644 --- a/testautomation/global/sid/e_all.sid +++ b/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 ' *********************************** diff --git a/testautomation/global/tools/includes/optional/t_security_tools.inc b/testautomation/global/tools/includes/optional/t_security_tools.inc index 28625be35880..6952f7ea16b3 100755 --- a/testautomation/global/tools/includes/optional/t_security_tools.inc +++ b/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 "Digital signatures..."</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 |