diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-24 13:34:45 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-24 13:34:45 +0000 |
| commit | 1c9b51a62a16e7625515d824a071eddb9a6e0385 (patch) | |
| tree | 363d193f7b05731909c7df578c84abd4d129d2c7 /testautomation | |
| parent | c4a5e50129ceca1d122baa0516781c0dca07f697 (diff) | |
CWS-TOOLING: integrate CWS automation310g_DEV300
2009-04-21 13:35:54 +0200 tbo r271033 : #i101044#
2009-04-21 13:04:14 +0200 jsk r271031 : #i101240# sMakeReadOnlyDocumentEditable()-fix
Diffstat (limited to 'testautomation')
| -rw-r--r-- | testautomation/global/tools/closeoffice.bas | 4 | ||||
| -rwxr-xr-x | testautomation/global/tools/includes/required/t_doc2.inc | 2 | ||||
| -rwxr-xr-x | testautomation/global/tools/resetoffice.bas | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/testautomation/global/tools/closeoffice.bas b/testautomation/global/tools/closeoffice.bas index 43b0f5e5c147..c746a40a0d68 100644 --- a/testautomation/global/tools/closeoffice.bas +++ b/testautomation/global/tools/closeoffice.bas @@ -41,10 +41,6 @@ sub main try printlog ResetApplication FileExit "SynchronMode", TRUE - kontext - if active.exists(5) then - active.no 'discard changes - endif catch endcatch wait (gOOoShutdownTimeOut * 1000) diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc index 522c78240660..77d791f9f47d 100755 --- a/testautomation/global/tools/includes/required/t_doc2.inc +++ b/testautomation/global/tools/includes/required/t_doc2.inc @@ -140,6 +140,8 @@ function sMakeReadOnlyDocumentEditable() as boolean for iTry = 1 to 2 + sleep( 2 ) + Kontext "Active" if ( Active.exists( 5 ) ) then diff --git a/testautomation/global/tools/resetoffice.bas b/testautomation/global/tools/resetoffice.bas index 724668741c53..5f4dec84abba 100755 --- a/testautomation/global/tools/resetoffice.bas +++ b/testautomation/global/tools/resetoffice.bas @@ -48,14 +48,6 @@ sub main ' to prevent messages about communication errors printlog ResetApplication FileExit "SynchronMode", TRUE - try - ' It is no error, if this fails - so it gets its own try/catch - kontext - if active.exists(5) then - active.no 'discard changes - endif - catch - endcatch catch warnlog sString + "Failed to close OOo." endcatch |