diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
commit | 8c59580b88a33d7f0c892c9c53776716ad661fcf (patch) | |
tree | da43a9c8f3ba7cba7afca05894acc8712f6e36ce /testautomation/writer/optional/includes/section/w_section_4.inc | |
parent | e62f74cabe9558e003d3105df7a69e3841dfc9ce (diff) | |
parent | 36979f1c9e43c42e62b0ad5a32b7abb2fc425b5b (diff) |
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
Diffstat (limited to 'testautomation/writer/optional/includes/section/w_section_4.inc')
-rw-r--r--[-rwxr-xr-x] | testautomation/writer/optional/includes/section/w_section_4.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testautomation/writer/optional/includes/section/w_section_4.inc b/testautomation/writer/optional/includes/section/w_section_4.inc index 2c811268f93b..632956e92d17 100755..100644 --- a/testautomation/writer/optional/includes/section/w_section_4.inc +++ b/testautomation/writer/optional/includes/section/w_section_4.inc @@ -856,8 +856,8 @@ testcase tParagraphSection_1 PrintLog " - Keep paragraphs together" '/// Open a file with 4 paragraphs, the 4th paragraph is crossing the page - Call hFileOpen(documentName) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( documentName) + EditSelectAll Call fInsertSection(sectionName) @@ -1198,8 +1198,8 @@ testcase tScenarioSection_1 next i '/// open testdocument (tScenarioSection_1.sxw) /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\section\tScenarioSection_1.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\section\tScenarioSection_1.sxw") + '/// Select 'File /Send -> Create Masterdocument /// FileSendCreateMasterdocument @@ -1318,8 +1318,8 @@ testcase tScenarioSection_2 next i '/// open testdocument (tScenarioSection_2.sxw) /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\section\tScenarioSection_2.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\section\tScenarioSection_2.sxw") + '/// Select 'File -> Send -> Create Masterdocument /// FileSendCreateMasterdocument |