summaryrefslogtreecommitdiffstats
path: root/testautomation/global/required/includes
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-01-12 17:33:34 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-01-12 17:33:34 +0100
commit67d2422e9ed81281d9c6b4da08a4549968aa1890 (patch)
tree837a3c1634c9c4fa36c6f5be3d7e671ab4359eff /testautomation/global/required/includes
parentmerge with DEV300_m95 (diff)
parentCWS-TOOLING: integrate CWS vcl117 (diff)
downloadcore-67d2422e9ed81281d9c6b4da08a4549968aa1890.tar.gz
core-67d2422e9ed81281d9c6b4da08a4549968aa1890.zip
rebase to DEV300_m97
Diffstat (limited to 'testautomation/global/required/includes')
-rw-r--r--testautomation/global/required/includes/g_option.inc11
1 files changed, 8 insertions, 3 deletions
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 2f7b6aa33ac2..0c40d3c3d08e 100644
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -756,7 +756,7 @@ testcase tToolsOptionsImprovementProgram
Active.ok()
else
if ( NOT bImportDialogHasBeenDisplayed ) then
- qaerrorlog( "#i97340# Show Data button enabled but no logged data found" )
+ warnlog( "#i97340# Show Data button enabled but no logged data found" )
endif
endif
@@ -767,8 +767,13 @@ testcase tToolsOptionsImprovementProgram
endif
Kontext "OptionenDlg"
- OptionenDlg.cancel()
-
+ if OptionenDlg.Exists then
+ OptionenDlg.cancel()
+ endif
+
+ if GetDocumentCount = 1 then
+ Call hCloseDocument
+ endif
else
' hDeleteFile() returns FALSE if the file is still present for some weird reason
' We should warn about this because the test breaks at a later point then.