summaryrefslogtreecommitdiff
path: root/testautomation/global/required/includes
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2011-01-19 16:36:58 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2011-01-19 16:36:58 +0100
commit8a9ecc1458d95e82b81117d209eb34332cc0abe4 (patch)
tree837a3c1634c9c4fa36c6f5be3d7e671ab4359eff /testautomation/global/required/includes
parent0aea5f8fa50336696d98adfe70a0b3f06ffab90a (diff)
parent81a1e2267f8ff50e72d7883d76de7f3a074f5a6a (diff)
gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing
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.