diff options
author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-02-25 10:57:01 +0100 |
---|---|---|
committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-02-25 10:57:01 +0100 |
commit | ec9c8b3d76fd18e654b0fcaa8fdb226508d3d6ec (patch) | |
tree | cb74e804f212e5e2248c3a4ce9cead30e9682193 /testautomation/global/tools/includes/required/t_tools3.inc | |
parent | 101b420e71b13189c36a81f1ce35702da84b161d (diff) |
vitomation01: #i109562 - hCloseDIalog() - Finally the function appears to be stable and relieable.
Diffstat (limited to 'testautomation/global/tools/includes/required/t_tools3.inc')
-rwxr-xr-x | testautomation/global/tools/includes/required/t_tools3.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc index 64572021c61d..659258507587 100755 --- a/testautomation/global/tools/includes/required/t_tools3.inc +++ b/testautomation/global/tools/includes/required/t_tools3.inc @@ -993,7 +993,7 @@ function hCloseDialog( oDialog as object, sUserFlags as string ) as boolean const METHOD_OK = 3 const TIMEOUT = 2 ' Maximum time to wait for a dialog to close - dim sFlags as string : sFlagList = lcase( sUserFlags ) + dim sFlags as string : sFlags = lcase( sUserFlags ) dim iClosingMethod as integer dim bDialogMustExist as boolean : bDialogMustExist = TRUE @@ -1018,7 +1018,8 @@ function hCloseDialog( oDialog as object, sUserFlags as string ) as boolean case METHOD_CLOSE : oDialog.close() case METHOD_CANCEL : oDialog.cancel() case METHOD_OK : oDialog.ok() - case else : warnlog( CFN & " Script error: Allowed closing methods are <cancel>, <close> and <ok>." ) + case else : + warnlog( CFN & " Script error: Allowed closing methods are <cancel>, <close> and <ok>." ) end select else if ( bDialogMustExist ) then @@ -1028,6 +1029,7 @@ function hCloseDialog( oDialog as object, sUserFlags as string ) as boolean endif endif + ' Any other outcome until now returned FALSE. If we get here, we have a success. if ( oDialog.notExists( TIMEOUT ) ) then hCloseDialog() = TRUE end function |