From 6c5f191f198f6c6f41e3c354a4ba4ca87d56f848 Mon Sep 17 00:00:00 2001
From: "Helge Delfs [hde]" <hde@openoffice.org>
Date: Wed, 20 Oct 2010 21:40:42 +0200
Subject: automationdev300m87#i115106#fixed access to disabled controls and
 reloading local file

---
 .../writer/optional/includes/option/wr_o_2.inc     | 24 +++++++++++++++++++---
 .../writer/optional/includes/option/wr_o_3.inc     | 10 ++++-----
 .../writer/optional/includes/option/wr_o_4.inc     |  3 ---
 3 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'testautomation')

diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc
index 7b9322c169d8..4c5cdc95391f 100644
--- a/testautomation/writer/optional/includes/option/wr_o_2.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_2.inc
@@ -508,7 +508,13 @@ testcase tToolsOptionsWriterPrint1
     if bCheckboxes(10) then LeereSeitenDrucken.UnCheck else LeereSeitenDrucken.Check
     if bCheckboxes(11) then AusDruckereinstellung.UnCheck  else AusDruckereinstellung.Check
 
-    if (Keine.IsChecked = True) then NurNotizen.Check else Keine.Check
+    if Keine.IsEnabled then
+        if (Keine.IsChecked = True) then
+            NurNotizen.Check
+        else
+            Keine.Check
+        endif
+    endif
 
     bTempRadioBut(1) = Keine.IsChecked
     bTempRadioBut(2) = NurNotizen.IsChecked
@@ -612,7 +618,13 @@ testcase tToolsOptionsWriterPrint1
     LeereSeitenDrucken.UnCheck
     AusDruckereinstellung.UnCheck
 
-    if (NurNotizen.IsChecked = True) then Dokumentende.Check else NurNotizen.Check
+    if NurNotizen.IsEnabled then
+        if (NurNotizen.IsChecked = True) then
+            Dokumentende.Check
+        else
+            NurNotizen.Check
+        endif
+    endif
 
     bTempRadioBut(1) = Keine.IsChecked
     bTempRadioBut(2) = NurNotizen.IsChecked
@@ -666,7 +678,13 @@ testcase tToolsOptionsWriterPrint1
     LeereSeitenDrucken.Check
     AusDruckereinstellung.Check
 
-    if (Dokumentende.IsChecked = True) then Seitenende.Check else Dokumentende.Check
+    if Dokumentende.IsEnabled then
+        if (Dokumentende.IsChecked = True) then
+            Seitenende.Check
+        else
+            Dokumentende.Check
+        endif
+    endif
 
     bTempRadioBut(1) = Keine.IsChecked
     bTempRadioBut(2) = NurNotizen.IsChecked
diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc
index 9868740c733c..0a047499d9f8 100644
--- a/testautomation/writer/optional/includes/option/wr_o_3.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_3.inc
@@ -1097,10 +1097,10 @@ endcase
 '------------------------------------------------------------------------------------------------------------
 testcase tToolsOptionsWriterCompatibility3
 
-DIM iWords_to_right     AS integer 'variable for counting word-steps
-DIM iOptionsCount       AS integer 'variable for counting options on cmopatibility page
-DIM sDocument           AS string  'variable for saving the doc
-DIM sFoundWord          AS string  'variable for word found one line below
+    DIM iWords_to_right     AS integer 'variable for counting word-steps
+    DIM iOptionsCount       AS integer 'variable for counting options on cmopatibility page
+    DIM sDocument           AS string  'variable for saving the doc
+    DIM sFoundWord          AS string  'variable for word found one line below
 
     printlog ">>> Configuration of behavior when a line break is inserted <<<"
     '/// New Writer Doc
@@ -1253,7 +1253,7 @@ DIM sFoundWord          AS string  'variable for word found one line below
     ExtrasOptionenDLG.Cancel
 
     printlog "Reload recently saved document"
-    hFileOpenLocally( sDocument)
+    hFileOpen( sDocument)
 
     printlog "Tools-Options-OOo Writer-Compatibility"
     ToolsOptions
diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc
index 53915f76bc63..d5516718ee66 100644
--- a/testautomation/writer/optional/includes/option/wr_o_4.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_4.inc
@@ -858,9 +858,6 @@ endcase
 
 testcase tToolsOptionsWriterMailMerge
 
-    warnlog( "#i111914# - Test excluded, needs review" )
-    goto endsub
-
     Call hNewDocument
     printlog ("- Tools/Options/Writer: Mail Merge ")
     Kontext "Navigator"
-- 
cgit