cws tl74: merge with DEV300_m75

3 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/optional/input/validity.ods b/testautomation/spreadsheet/optional/input/validity.ods
index 06a980c67478..aced256e948b 100755
--- a/testautomation/spreadsheet/optional/input/validity.ods
+++ b/testautomation/spreadsheet/optional/input/validity.ods
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