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, 22 insertions, 22 deletions

diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc
index 77af9b0a0301..37c79948a1cc 100755..100644
--- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc
+++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc
@@ -73,8 +73,8 @@ testcase tParagraphTabs1
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Tabs ,
    '/// + check Left in the type area , and input 3cm in Position
@@ -119,8 +119,8 @@ testcase tParagraphTabs2
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Tabs ,
    '/// + check Right in the type area , and input 3cm in Position
@@ -165,8 +165,8 @@ testcase tParagraphTabs3
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Tabs ,
    '/// + check Centered in the type area , and input 3cm in Position
@@ -212,8 +212,8 @@ testcase tParagraphTabs4
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file ,
    '/// + and there are 1 "." seperator in front of the pic
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Tabs ,
    '/// + check Decimal in the type area ,
@@ -351,8 +351,8 @@ testcase tParagraphDropCaps1
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Drop Caps ,
    '/// + Check 'Display Drop Caps' , close the dialog
@@ -403,8 +403,8 @@ testcase tParagraphDropCaps2
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Drop Caps ,
    '/// + Check 'Display Drop Caps' , then check 'whole word' , then close the dialog
@@ -457,8 +457,8 @@ testcase tParagraphDropCaps3
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Drop Caps ,
    '/// + Check 'Display Drop Caps' , then set '6' in 'number of characters' ,then close the dialog
@@ -511,8 +511,8 @@ testcase tParagraphDropCaps4
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Drop Caps ,
    '/// + Check 'Display Drop Caps' , then set '6' in 'Lines' ,then close the dialog
@@ -562,8 +562,8 @@ testcase tParagraphDropCaps5
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Drop Caps ,
    '/// +  Check 'Display Drop Caps' ,then set 'Space to text' to be 1cm , close the dialog
@@ -648,8 +648,8 @@ testcase tParagraphDropCaps7
 
    '/// Open the test file
    '/// + There is 1 pic which is anchored as character in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Format/Paragraph / Drop Caps ,
    '/// + Check 'Display Drop Caps' ,then set Xyz in Contents 'Text' field , close the dialog
@@ -779,8 +779,8 @@ testcase tParagraphNumbering1
 
    '/// Open the test file ,
    '/// + there are 2 paragraphes in the file
-    Call hFileOpen(sTestFile)
-    Call sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( sTestFile )
+    
 
    '/// Find the test word , set the focus to 1st paragraph
     Call fFindWord( sTest1 )