summaryrefslogtreecommitdiff
path: root/testautomation/global
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2011-01-05 15:48:52 +0100
committerVladimir Glazunov <vg@openoffice.org>2011-01-05 15:48:52 +0100
commit8b6c5db130c88bf84b007bd4aa43a1773cb66a6f (patch)
tree801644c74f2ac1971935dad1f3201f9bfb3297db /testautomation/global
parentba973d7fba682aa951bea428e6fed80c5d414897 (diff)
parent38af65d1b4f83de02e9d95f85349932990830947 (diff)
CWS-TOOLING: integrate CWS automationdev300m95
Diffstat (limited to 'testautomation/global')
-rw-r--r--[-rwxr-xr-x]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 100755..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.