diff options
| author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-03-11 14:00:06 +0100 |
|---|---|---|
| committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-03-11 14:00:06 +0100 |
| commit | 37cb8833eb2a88b8a42e2dc26fc1200230f3ce33 (patch) | |
| tree | 06a675d30ca0f1ff70b8937825479b18190c18c4 /testautomation/spreadsheet | |
| parent | 243bf1856ba1705fdcf42861cef4f82e692f40f5 (diff) | |
| parent | 4de2643ea718f0c246a87667036dbadacdbc708d (diff) | |
vitomation01: Local merge with DEV300_m74
Diffstat (limited to 'testautomation/spreadsheet')
| -rw-r--r-- | testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc | 17 | ||||
| -rw-r--r-- | testautomation/spreadsheet/required/includes/c_upd_filemenu.inc | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc index 393dd7f68fff..186fe00ae9e4 100644 --- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc +++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc @@ -57,7 +57,7 @@ testcase tIBIS111099 if SwitchControlDesignMode.getState(2) = 0 then printlog "OK, design mode is disabled" else - warnlog "Document is opened in design mode -> #111099#" + warnlog "#i108315# Document is opened in design mode -> #111099#" end if else printlog "Form controls toolbar was not enabled." @@ -84,23 +84,20 @@ testcase tIBIS111158 sleep(2) Kontext "FormControls" try - if SwitchControlDesignMode.IsEnabled then + if SwitchControlDesignMode.GetState(2) = 0 then '/// Click on 'Design Mode on/off' button on 'Form Controls'-toolbar SwitchControlDesignMode.click sleep(2) - '/// Click on 'Form Design' button on 'Form Controls'-toolbar - FormDesignTools.Click - sleep(2) - else - printlog "Form controls toolbar was not enabled." end if catch - QAErrorlog "Document is opened in design mode -> #111099#" - QAErrorlog "No need to test if that one isn't fixed -> aborted" + warnlog "Form controls toolbar was not enabled, maybe the doc is writeprotected." + Call hToolbarSelect("CONTROLS", false) call hCloseDocument goto endsub endcatch - + '/// Click on 'Form Design' button on 'Form Controls'-toolbar + FormDesignTools.Click + sleep(2) Kontext "FormDesignTools" if FormDesignTools.Exists(2) then If ShowFmExplorer.IsEnabled then diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index 4c1f18bf6cfe..5bf718203a47 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -500,7 +500,7 @@ testcase tFileSaveAsDBF Kontext if Active.exists(2) then printlog " " - warnlog "The following warning exists. This could be #i87325:" + warnlog "#i87325# - Unexpected messagebox" Printlog Active.GetText Printlog " " Active.OK |