diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-28 10:59:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-28 10:59:04 +0000 |
| commit | 13611ecd4bea0dfdce98cdae76a7a8431e5b6904 (patch) | |
| tree | 01f8ebf3950e8b506a8695cbc5bf7e453eeae570 /testautomation/global/tools/includes/required/t_files.inc | |
| parent | 8fa7296304eb4a057b9f647e72a83c225f04f72a (diff) | |
INTEGRATION: CWS greenstate30ver2_DEV300 (1.1.32.1.6); FILE MERGED
2008/08/28 09:36:48 rt 1.1.32.1.6.3: RESYNC: (1.1.32.1-1.1.32.3); FILE MERGED
2008/08/26 12:47:26 jsk 1.1.32.1.6.2: #i93121#
2008/08/26 06:49:02 jsk 1.1.32.1.6.1: #i93121
Diffstat (limited to 'testautomation/global/tools/includes/required/t_files.inc')
| -rwxr-xr-x | testautomation/global/tools/includes/required/t_files.inc | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index e720cb12b0ba..ed873139ef2d 100755 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -8,9 +8,9 @@ '* '* $RCSfile: t_files.inc,v $ '* -'* $Revision: 1.3 $ +'* $Revision: 1.4 $ '* -'* last change: $Author: vg $ $Date: 2008-08-18 12:06:46 $ +'* last change: $Author: rt $ $Date: 2008-08-28 11:59:04 $ '* '* This file is part of OpenOffice.org. '* @@ -905,13 +905,6 @@ function hFileWait() as integer exit do end if - ' LOAD: StarOffice Calendar (Triggered by template) - kontext "StarOfficeCalendar1" - if ( StarOfficeCalendar1.Exists() ) then - iWait = -8 - exit do - end if - ' SAVE: Password dialog kontext "PasswordDlg" if ( PasswordDlg.exists() ) then @@ -938,14 +931,15 @@ function hFileWait() as integer if ( C_INFO ) then select case iWait - case -1 : printlog( CFN & "Timeout reached, exiting" ) - case -2 : printlog( CFN & "Macro security warning displayed, exiting" ) - case -3 : printlog( CFN & "Dialog boxes are in the way, exiting" ) - case -4 : printlog( CFN & "Password dialog (load) displayed, exiting" ) - case -5 : printlog( CFN & "Password dialog (save) displayed, exiting" ) - case -6 : printlog( CFN & "Filter Selection dialog displayed, exiting" ) - case -7 : printlog( CFN & "ASCII filter options dialog displayed, exiting" ) - case -8 : printlog( CFN & "StarOffice Calendar (Template) displayed, exiting" ) + case -1 : printlog( CFN & "Timeout reached, rc = " & iWait ) + case -2 : printlog( CFN & "Macro security warning displayed, rc = " & iWait ) + case -3 : printlog( CFN & "Password dialog (load) displayed, rc = " & iWait ) + case -4 : printlog( CFN & "Password dialog (save) displayed, rc = " & iWait ) + case -5 : printlog( CFN & "Filter Selection dialog displayed, rc = " & iWait ) + case -6 : printlog( CFN & "ASCII filter options dialog displayed, rc = " & iWait ) + case -7 : printlog( CFN & "A dialog box is in the way (1 button), rc = " & iWait ) + case -8 : printlog( CFN & "A dialog box is in the way (2 buttons), rc = " & iWait ) + case -9 : printlog( CFN & "A dialog box is in the way (3 buttons), rc = " & iWait ) case else : printlog( CFN & "File I/O completed in " & iWait & " seconds" ) end select endif |