Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

Conflicts:
smoketestoo_native/data/Global.xml
smoketestoo_native/data/OptionsDlg.xml
smoketestoo_native/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/smoketest.cxx
test/source/cpp/getargument.cxx
test/source/cpp/officeconnection.cxx
testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
testautomation/framework/optional/includes/filedlg_cjk_folders.inc
testautomation/global/sid/all.sid
testautomation/global/sid/bars.sid
testautomation/global/sid/e_all.sid
testautomation/global/win/bars.win
testautomation/graphics/optional/includes/impress/i_slideshow2.inc
testautomation/graphics/optional/includes/impress/i_slideshow3.inc
testtools/source/bridgetest/bridgetest.cxx
testtools/source/bridgetest/constructors.cxx
testtools/source/bridgetest/makefile.mk
testtools/source/bridgetest/testComponent.component

1 files changed, 28 insertions, 10 deletions

diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc
index cdc8dc00de4c..4c5cdc95391f 100755..100644
--- a/testautomation/writer/optional/includes/option/wr_o_2.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_2.inc
@@ -102,8 +102,8 @@ testcase tToolsOptionsWriterDefaultfont (WestOrEast as string)
 
     '/// use a document to check the font with styles///'
     '///+ use 'input\\writer\\optional\\options\\options2.sxw' ///
-    Call hFileOpen ( sFileName )
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally(  sFileName )
+    
     printlog "- Tools/Options/Writer: DefaultFont"
 
     printlog ("/// - save states ///")
@@ -239,8 +239,8 @@ testcase tToolsOptionsWriterDefaultfont (WestOrEast as string)
 
     Printlog "'///  - verify global settings don't affect saved Document ///"
     '///+ use input\\writer\\optional\\options\\options2.sxw ///
-    Call hFileOpen ( sFileName )
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally(  sFileName )
+    
     Kontext "DocumentWriter"
     DocumentWriter.TypeKeys "<Up>", 5
     Call wTypeKeys "<Home><Right>"
@@ -463,8 +463,8 @@ testcase tToolsOptionsWriterPrint1
     '(4) = Seitenende
 
     '/// uses "input\\writer\\optional\\options\\options3.sxw" ///
-    Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options3.sxw" )
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally(  gTesttoolPath + "writer\optional\input\options\options3.sxw" )
+    
     printlog "'///- Tools/Options/Writer: PrintWriter ///"
 
     printlog ("'/// - save states ///")
@@ -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
@@ -587,7 +593,7 @@ testcase tToolsOptionsWriterPrint1
     ExtrasOptionenDlg.OK
     WaitSlot (2)
 	' Notify is saved with document
-    Call hFileOpen(gOfficepath + "user\work\printtest." & WriterFilterExtension(0) )
+    hFileOpen( gOfficePath & "user\work\printtest." & WriterFilterExtension(0) )
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "PRINT" )
 
@@ -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