diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-10-26 13:28:03 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-10-26 13:28:03 +0200 |
| commit | e7ef6d4dceb7e8e0c1d492d8c01296f6d88d5215 (patch) | |
| tree | 3540d786d63e00e9755122a324140cd508f99705 /testautomation/writer | |
| parent | 15c93af5a0740ad15be57aefef659de243c9be2f (diff) | |
| parent | ad312005bd3480e78f82824a95589e0673c56d93 (diff) | |
CWS-TOOLING: integrate CWS automationdev300m87
Notes
split repo tag: testing_ooo/DEV300_m91
Diffstat (limited to 'testautomation/writer')
75 files changed, 1165 insertions, 1351 deletions
diff --git a/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc b/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc index 74f65eaa1704..a80e5b0e925b 100644 --- a/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc +++ b/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc @@ -37,7 +37,6 @@ sub w_alternative_text Call tFrameAlternativeText Call tOLEAlternativeText - end sub '------------------------------------------------------------------------- @@ -106,7 +105,7 @@ testcase tPictureAlternativeText Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\tPictureAlternativeText.odt" ) + hFileOpen( gOfficePath + "user\work\tPictureAlternativeText.odt" ) ' select graphic Call wTypeKeys ("<SHIFT F4>") @@ -190,7 +189,7 @@ testcase tFrameAlternativeText Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\tFrameAlternativeText.odt" ) + hFileOpen( gOfficePath + "user\work\tFrameAlternativeText.odt" ) ' select frame Call wTypeKeys ("<SHIFT F4>") @@ -271,7 +270,7 @@ testcase tOLEAlternativeText Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\tOLEAlternativeText.odt" ) + hFileOpen( gOfficePath + "user\work\tOLEAlternativeText.odt" ) ' select OLE Call wTypeKeys ("<SHIFT F4>") @@ -293,7 +292,5 @@ testcase tOLEAlternativeText printlog "- close document" Call hCloseDocument - - endcase
\ No newline at end of file diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc index b15edc69479a..88297c3aa709 100644 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc @@ -127,8 +127,8 @@ testcase tToolsAutocorrectWordCompletion_2 '/// delete all entries '/// close and reopen dialog, check entries again - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list Call fDeleteAllEntries() @@ -196,8 +196,8 @@ testcase tToolsAutocorrectWordCompletion_3 '/// backwards with <SHIFT-CTRL-Tab> '/// endless loop test - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list Call fDeleteAllEntries() @@ -287,8 +287,8 @@ testcase tToolsAutocorrectWordCompletion_4 MaxEintraege.SetText sTestMaxEntries TabWortergaenzung.OK - Call hFileOpen ( gTesttoolPath + "writer\optional\input\advanced\" + sTestFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\advanced\" + sTestFile ) + Sleep 4 ToolsAutocorrect @@ -337,8 +337,8 @@ testcase tToolsAutocorrectWordCompletion_5 'Test when checkbox is checkec -- default 'Open 1st file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list Call fDeleteAllEntries() @@ -355,8 +355,8 @@ testcase tToolsAutocorrectWordCompletion_5 Call wTypeKeys sTestWord1 'Open 2nd file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) + Call wTypeKeys sTestWord2 Call wTypeKeys sTestWord3 @@ -386,8 +386,8 @@ testcase tToolsAutocorrectWordCompletion_5 'Test when checkbox is Checked 'Open 1st file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list fDeleteAllEntries() @@ -403,8 +403,8 @@ testcase tToolsAutocorrectWordCompletion_5 Call wTypeKeys sTestWord1 'Open 2nd file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) + Call wTypeKeys sTestWord2 Call wTypeKeys sTestWord3 @@ -453,8 +453,8 @@ testcase tToolsAutocorrectWordCompletion_6 '/// and a help tip will appear <--- no way to test yet 'Show as Tip -- uncheck (default) - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + Call wTypeKeys sTestWord Call wTypeKeys "<Return>" diff --git a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc index de6a4d0b4fef..0c9f976b187b 100644 --- a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc +++ b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc @@ -141,8 +141,8 @@ end function function wSetClipboardtestDefaults(ForWhat as string) as boolean printlog " Points cursor to beginning of document " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\writer.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\writer.sxw") + Kontext "DocumentWriter" printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" diff --git a/testautomation/writer/optional/includes/clipboard/w_210_.inc b/testautomation/writer/optional/includes/clipboard/w_210_.inc index 12926c8a486b..bef3214a1d46 100644 --- a/testautomation/writer/optional/includes/clipboard/w_210_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_210_.inc @@ -225,7 +225,7 @@ testcase WriterToWriterFrame printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_frame.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_frame.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -267,7 +267,7 @@ testcase WriterToWriterDrawingObject printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_draw.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_draw.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -309,7 +309,7 @@ testcase WriterToWriterGraphicLinked printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_graphic1.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_graphic1.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -351,7 +351,7 @@ testcase WriterToWriterGraphicEmbedded printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_graphic2.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_graphic2.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -393,7 +393,7 @@ testcase WriterToWriterOLEObject printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_ole.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_ole.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -435,7 +435,7 @@ testcase WriterToWriterControl printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_control.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_control.odt",false) printlog " + Close saved document " Call hCloseDocument else diff --git a/testautomation/writer/optional/includes/clipboard/w_211_.inc b/testautomation/writer/optional/includes/clipboard/w_211_.inc index b385e745cf16..7c4476eccc92 100644 --- a/testautomation/writer/optional/includes/clipboard/w_211_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_211_.inc @@ -79,7 +79,7 @@ testcase WriterToCalcText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_text.ods",true) + hFileOpen( gOfficepath + "user\work\writer_to_calc_text.ods",true) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -133,7 +133,7 @@ testcase WriterToCalcField Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_field.ods",true) + hFileOpen( gOfficepath + "user\work\writer_to_calc_field.ods",true) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -192,7 +192,7 @@ testcase WriterToCalcTable kontext "navigator" if navigator.exists then navigator.close - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_table.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_table.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -248,7 +248,7 @@ testcase WriterToCalcFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_frame.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_frame.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -302,7 +302,7 @@ testcase WriterToCalcDrawingObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_draw.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_draw.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -357,7 +357,7 @@ testcase WriterToCalcGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_graphic1.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_graphic1.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -412,7 +412,7 @@ testcase WriterToCalcGraphicEmbedded Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_graphic2.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_graphic2.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -466,7 +466,7 @@ testcase WriterToCalcOLEObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_ole.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_ole.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -520,7 +520,7 @@ testcase WriterToCalcControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_control.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_control.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_212_.inc b/testautomation/writer/optional/includes/clipboard/w_212_.inc index 6c2a6e9c175e..277a837d42bd 100644 --- a/testautomation/writer/optional/includes/clipboard/w_212_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_212_.inc @@ -80,7 +80,7 @@ testcase WriterToImpressText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_text.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_text.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -134,7 +134,7 @@ testcase WriterToImpressField Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_field.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_field.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -188,7 +188,7 @@ testcase WriterToImpressTable Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_table.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_table.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -242,7 +242,7 @@ testcase WriterToImpressFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_frame.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_frame.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -296,7 +296,7 @@ testcase WriterToImpressDrawingObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_draw.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_draw.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -350,7 +350,7 @@ testcase WriterToImpressGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_graphic1.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_graphic1.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -404,7 +404,7 @@ testcase WriterToImpressGraphicEmbedded Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_graphic2.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_graphic2.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -458,7 +458,7 @@ testcase WriterToImpressOLEObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_ole.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_ole.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -512,7 +512,7 @@ testcase WriterToImpressControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_control.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_control.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_213_.inc b/testautomation/writer/optional/includes/clipboard/w_213_.inc index 1cf8e50fa2de..72cdeac69678 100644 --- a/testautomation/writer/optional/includes/clipboard/w_213_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_213_.inc @@ -79,7 +79,7 @@ testcase WriterToDrawText Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_text.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_text.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -133,7 +133,7 @@ testcase WriterToDrawField Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_field.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_field.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -187,7 +187,7 @@ testcase WriterToDrawTable Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_table.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_table.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -241,7 +241,7 @@ testcase WriterToDrawFrame Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_frame.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_frame.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -295,7 +295,7 @@ testcase WriterToDrawDrawingObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_draw.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_draw.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -350,7 +350,7 @@ testcase WriterToDrawGraphicLinked Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_graphic1.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_graphic1.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -405,7 +405,7 @@ testcase WriterToDrawGraphicEmbedded Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_graphic2.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_graphic2.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -459,7 +459,7 @@ testcase WriterToDrawOLEObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_ole.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_ole.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -513,7 +513,7 @@ testcase WriterToDrawControl Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_control.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_control.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_214_.inc b/testautomation/writer/optional/includes/clipboard/w_214_.inc index 5f6521b4ae67..12b9b687b426 100644 --- a/testautomation/writer/optional/includes/clipboard/w_214_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_214_.inc @@ -78,7 +78,7 @@ testcase WriterToHTMLText Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_text.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_text.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -131,7 +131,7 @@ testcase WriterToHTMLField Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_field.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_field.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -184,7 +184,7 @@ testcase WriterToHTMLTable Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_table.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_table.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -237,7 +237,7 @@ testcase WriterToHTMLFrame Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_frame.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_frame.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -290,7 +290,7 @@ testcase WriterToHTMLDrawingObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_draw.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_draw.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -343,7 +343,7 @@ testcase WriterToHTMLGraphicLinked Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_graphic1.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_graphic1.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -396,7 +396,7 @@ testcase WriterToHTMLGraphicEmbedded Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_graphic2.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_graphic2.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -449,7 +449,7 @@ testcase WriterToHTMLOLEObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_ole.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_ole.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -502,7 +502,7 @@ testcase WriterToHTMLControl Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_control.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_control.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_215_.inc b/testautomation/writer/optional/includes/clipboard/w_215_.inc index 95883f35ae1b..992efb2981ca 100644 --- a/testautomation/writer/optional/includes/clipboard/w_215_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_215_.inc @@ -50,8 +50,8 @@ testcase CalcToWriterText1 printlog " Jump to beginning of document " printlog " Select cell <A2> " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "<Mod1 Home>" @@ -113,8 +113,8 @@ testcase CalcToWriterText2 printlog " Jump to beginning of document " printlog " Select cell <A1>, press F2 and select all " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "<Mod1 Home>" @@ -147,7 +147,7 @@ testcase CalcToWriterText2 Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_textformat_cellcontent.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_textformat_cellcontent.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -168,8 +168,8 @@ testcase CalcToWriterCalculation printlog " Jump to beginning of document " printlog " Select cell <A5:C5> " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "<Mod1 Home>" @@ -232,8 +232,8 @@ testcase CalcToWriterHyperlink1 printlog " Jump to beginning of document " printlog " Select cell <A8> " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "<Mod1 Home>" @@ -295,8 +295,8 @@ testcase CalcToWriterHyperlink2 printlog " Jump to beginning of document " printlog " Select cell <A8> " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "<Mod1 Home>" @@ -329,7 +329,7 @@ testcase CalcToWriterHyperlink2 Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_hyperlink_cellcontent.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_hyperlink_cellcontent.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -350,8 +350,8 @@ testcase CalcToWriterDrawObject printlog " Jump to beginning of document " printlog " Select Drawing object " printlog " Copy selected object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " Call wNavigatorAuswahl(8,1) @@ -381,7 +381,7 @@ testcase CalcToWriterDrawObject Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_draw.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_draw.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -402,8 +402,8 @@ testcase CalcToWriterOLE printlog " Jump to beginning of document " printlog " Select OLE-Object " printlog " Copy selected object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " Call wNavigatorAuswahl(6,1) @@ -433,7 +433,7 @@ testcase CalcToWriterOLE Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_ole.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_ole.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc index 3952ece03e4c..bfbbdf637695 100644 --- a/testautomation/writer/optional/includes/clipboard/w_216_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc @@ -50,8 +50,8 @@ testcase HTMLToWRITERText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + sleep (3) if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" @@ -122,8 +122,8 @@ testcase HTMLToWRITERField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -192,8 +192,8 @@ testcase HTMLToWRITERTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -262,8 +262,8 @@ testcase HTMLToWRITERGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -297,7 +297,7 @@ testcase HTMLToWRITERGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_writer_graphic1.odt",false) + hFileOpen( gOfficepath + "user\work\html_to_writer_graphic1.odt",false) printlog " Reopen saved document " Wait 500 printlog " Close saved document " @@ -321,8 +321,8 @@ testcase HTMLToWRITERControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -357,7 +357,7 @@ testcase HTMLToWRITERControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_writer_control.odt",false) + hFileOpen( gOfficepath + "user\work\html_to_writer_control.odt",false) printlog " Reopen saved document " Wait 500 printlog " Close saved document " @@ -381,8 +381,8 @@ testcase HTMLToWRITERFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -423,7 +423,7 @@ testcase HTMLToWRITERFloatingFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_writer_float.odt",false) + hFileOpen( gOfficepath + "user\work\html_to_writer_float.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_217_.inc b/testautomation/writer/optional/includes/clipboard/w_217_.inc index fcb6b450803a..5e81b745f6d8 100644 --- a/testautomation/writer/optional/includes/clipboard/w_217_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_217_.inc @@ -49,8 +49,8 @@ testcase HTMLToCALCText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Shift Down><Shift End>" @@ -115,8 +115,8 @@ testcase HTMLToCALCField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",2 @@ -149,7 +149,7 @@ testcase HTMLToCALCField Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_field.ods",true) + hFileOpen( gOfficepath + "user\work\html_to_calc_field.ods",true) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -172,8 +172,8 @@ testcase HTMLToCALCTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",5 @@ -203,7 +203,7 @@ testcase HTMLToCALCTable printlog " Save document as ..\user\work\html_to_calc_table.ods" Call hCloseDocument printlog " Close saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_table.ods",true) + hFileOpen( gOfficepath + "user\work\html_to_calc_table.ods",true) printlog " Reopen saved document " Call hCloseDocument printlog " Close saved document " @@ -226,8 +226,8 @@ testcase HTMLToCALCGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -260,7 +260,7 @@ testcase HTMLToCALCGraphicLinked Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_graphic1.ods",false) + hFileOpen( gOfficepath + "user\work\html_to_calc_graphic1.ods",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -283,8 +283,8 @@ testcase HTMLToCALCControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -317,7 +317,7 @@ testcase HTMLToCALCControl Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_control.ods",false) + hFileOpen( gOfficepath + "user\work\html_to_calc_control.ods",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -340,8 +340,8 @@ testcase HTMLToCALCFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -378,7 +378,7 @@ testcase HTMLToCALCFloatingFrame printlog " Close saved document " Call hCloseDocument printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_float.ods",false) + hFileOpen( gOfficepath + "user\work\html_to_calc_float.ods",false) printlog " Close saved document " Call hCloseDocument else diff --git a/testautomation/writer/optional/includes/clipboard/w_218_.inc b/testautomation/writer/optional/includes/clipboard/w_218_.inc index 6788407f6c05..08f23ef0df96 100644 --- a/testautomation/writer/optional/includes/clipboard/w_218_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_218_.inc @@ -49,8 +49,8 @@ testcase HTMLToDRAWText printlog " + Jump to beginning of document " printlog " + Select first paragraph " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Shift Down><Shift End>" @@ -115,8 +115,8 @@ testcase HTMLToDRAWField printlog " + Jump to beginning of document " printlog " + Select paragraph with 'Date Field' " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",2 @@ -154,7 +154,7 @@ testcase HTMLToDRAWField Call hCloseDocument sleep (2) printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_field.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_field.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -177,8 +177,8 @@ testcase HTMLToDRAWTable printlog " + Jump to beginning of document " printlog " + Select 'Table' " printlog " + Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",5 @@ -211,7 +211,7 @@ testcase HTMLToDRAWTable Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_table.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_table.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -234,8 +234,8 @@ testcase HTMLToDRAWGraphicLinked printlog " + Jump to beginning of document " printlog " + Select 'Linked Graphic' " printlog " + Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -267,7 +267,7 @@ testcase HTMLToDRAWGraphicLinked Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_graphic1.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_graphic1.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -290,8 +290,8 @@ testcase HTMLToDRAWControl printlog " + Jump to beginning of document " printlog " + Select 'Control' " printlog " + Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -324,7 +324,7 @@ testcase HTMLToDRAWControl Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_control.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_control.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -347,8 +347,8 @@ testcase HTMLToDRAWFloatingFrame printlog " + Jump to beginning of document " printlog " + Select 'Floating Frame' " printlog " + Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -386,7 +386,7 @@ testcase HTMLToDRAWFloatingFrame Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_float.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_float.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_219_.inc b/testautomation/writer/optional/includes/clipboard/w_219_.inc index 74ca4d7c5f71..371e1e127e6e 100644 --- a/testautomation/writer/optional/includes/clipboard/w_219_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_219_.inc @@ -49,8 +49,8 @@ testcase HTMLToIMPRESSText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Shift Down><Shift End>" @@ -115,8 +115,8 @@ testcase HTMLToIMPRESSField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",2 @@ -149,7 +149,7 @@ testcase HTMLToIMPRESSField Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_field.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_field.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -172,8 +172,8 @@ testcase HTMLToIMPRESSTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",5 @@ -206,7 +206,7 @@ testcase HTMLToIMPRESSTable Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_table.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_table.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -229,8 +229,8 @@ testcase HTMLToIMPRESSGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -262,7 +262,7 @@ testcase HTMLToIMPRESSGraphicLinked Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_graphic1.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_graphic1.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -285,8 +285,8 @@ testcase HTMLToIMPRESSControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -319,7 +319,7 @@ testcase HTMLToIMPRESSControl Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_control.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_control.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -342,8 +342,8 @@ testcase HTMLToIMPRESSFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -381,7 +381,7 @@ testcase HTMLToIMPRESSFloatingFrame Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_float.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_float.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_220_.inc b/testautomation/writer/optional/includes/clipboard/w_220_.inc index e938ba027fd1..4ae43a6d7124 100644 --- a/testautomation/writer/optional/includes/clipboard/w_220_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_220_.inc @@ -54,8 +54,8 @@ testcase HTMLToHTMLText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Shift Down><Shift End>" @@ -86,7 +86,7 @@ testcase HTMLToHTMLText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_text.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_text.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -110,8 +110,8 @@ testcase HTMLToHTMLField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",2 @@ -143,7 +143,7 @@ testcase HTMLToHTMLField Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_field.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_field.html" ) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -167,8 +167,8 @@ testcase HTMLToHTMLTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",5 @@ -200,7 +200,7 @@ testcase HTMLToHTMLTable Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_table.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_table.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -224,8 +224,8 @@ testcase HTMLToHTMLGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -256,7 +256,7 @@ testcase HTMLToHTMLGraphicLinked Call hCloseDocument printlog " Close saved document " sleep (2) - Call hFileOpen (gOfficepath + "user\work\html_to_html_graphic1.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_graphic1.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -280,8 +280,8 @@ testcase HTMLToHTMLControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -313,7 +313,7 @@ testcase HTMLToHTMLControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_control.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_control.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -337,8 +337,8 @@ testcase HTMLToHTMLFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -375,7 +375,7 @@ testcase HTMLToHTMLFloatingFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_float.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_float.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_221_.inc b/testautomation/writer/optional/includes/clipboard/w_221_.inc index 4b5818065244..7b5674d9ca97 100644 --- a/testautomation/writer/optional/includes/clipboard/w_221_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_221_.inc @@ -50,8 +50,8 @@ testcase DrawToHTMLScrollingText printlog " + Jump to beginning of document " printlog " + Select Scrolling text " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>" @@ -80,7 +80,7 @@ testcase DrawToHTMLScrollingText Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_scrolling_text.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_scrolling_text.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -105,8 +105,8 @@ testcase DrawToHTMLGroupedObject printlog " + Jump to beginning of document " printlog " + Select Grouped Object " printlog " + Copy selected Object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",2 @@ -135,7 +135,7 @@ testcase DrawToHTMLGroupedObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_grouped_object.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_grouped_object.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -160,8 +160,8 @@ testcase DrawToHTML3D printlog " + Jump to beginning of document " printlog " + Select cell <A5:C5> " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",3 @@ -190,7 +190,7 @@ testcase DrawToHTML3D Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_3d.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_3d.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -215,8 +215,8 @@ testcase DrawToHTMLFontwork printlog " + Jump to beginning of document " printlog " + Select Fontwork " printlog " + Copy selected Fontwork " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",4 @@ -245,7 +245,7 @@ testcase DrawToHTMLFontwork Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_fontwork.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_fontwork.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -270,8 +270,8 @@ testcase DrawToHTMLBullets printlog " + Jump to beginning of document " printlog " + Select Bullets " printlog " + Copy selected Bullets " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",5 @@ -300,7 +300,7 @@ testcase DrawToHTMLBullets Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_bullets.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_bullets.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -325,8 +325,8 @@ testcase DrawToHTMLDimensionLines printlog " + Jump to beginning of document " printlog " + Select Dimension Lines " printlog " + Copy selected Dimension Lines " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<PageDown>" @@ -356,7 +356,7 @@ testcase DrawToHTMLDimensionLines Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_dim_lines.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_dim_lines.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -381,8 +381,8 @@ testcase DrawToHTMLConnectors printlog " + Jump to beginning of document " printlog " + Select Connectors " printlog " + Copy selected Connectors " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<PageDown>" @@ -412,7 +412,7 @@ testcase DrawToHTMLConnectors Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_connectors.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_connectors.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_222_.inc b/testautomation/writer/optional/includes/clipboard/w_222_.inc index 1efb0e67fda4..166ad4b4e38e 100644 --- a/testautomation/writer/optional/includes/clipboard/w_222_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_222_.inc @@ -51,8 +51,8 @@ testcase DrawToWriterScrollingText printlog " Jump to beginning of document " printlog " Select Scrolling text " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>" @@ -81,7 +81,7 @@ testcase DrawToWriterScrollingText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_scrolling_text.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_scrolling_text.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -106,8 +106,8 @@ testcase DrawToWriterGroupedObject printlog " Jump to beginning of document " printlog " Select Grouped Object " printlog " Copy selected Object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",2 @@ -136,7 +136,7 @@ testcase DrawToWriterGroupedObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_grouped_object.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_grouped_object.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -161,8 +161,8 @@ testcase DrawToWriter3D printlog " Jump to beginning of document " printlog " Select cell <A5:C5> " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",3 @@ -191,7 +191,7 @@ testcase DrawToWriter3D Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_3d.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_3d.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -216,8 +216,8 @@ testcase DrawToWriterFontwork printlog " Jump to beginning of document " printlog " Select Fontwork " printlog " Copy selected Fontwork " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",4 @@ -246,7 +246,7 @@ testcase DrawToWriterFontwork Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_fontwork.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_fontwork.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -271,8 +271,8 @@ testcase DrawToWriterBullets printlog " Jump to beginning of document " printlog " Select Bullets " printlog " Copy selected Bullets " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<Tab>",5 @@ -301,7 +301,7 @@ testcase DrawToWriterBullets Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_bullets.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_bullets.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -326,8 +326,8 @@ testcase DrawToWriterDimensionLines printlog " Jump to beginning of document " printlog " Select Dimension Lines " printlog " Copy selected Dimension Lines " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<PageDown>" @@ -357,7 +357,7 @@ testcase DrawToWriterDimensionLines Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_dim_lines.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_dim_lines.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -382,8 +382,8 @@ testcase DrawToWriterConnectors printlog " Jump to beginning of document " printlog " Select Connectors " printlog " Copy selected Connectors " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "<PageDown>" @@ -413,7 +413,7 @@ testcase DrawToWriterConnectors Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_connectors.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_connectors.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc index c4d79cece29a..75db278c25ef 100644 --- a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc +++ b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc @@ -177,6 +177,8 @@ endcase testcase tPickGraphic + Warnlog "#i115132#Missing .uno Slots in context menus" + goto endsub printlog "Open context menu on not focussed graphic" Call hNewDocument Printlog " Set zoom to 100%" @@ -187,19 +189,12 @@ testcase tPickGraphic Call wTypeKeys "<Escape>" Call wTypeKeys "Don't be afraid !" - Call DocumentWriter.MouseMove 50,30 + Call gMouseClick ( 50,30 ) Printlog " Open context menu upon graphic with mouse" Call wOpenContextMenu(true) printlog " Select 'ImageMap' in context menu" - try - CALL hMenuFindSelect (".uno:ImageMapDialog", true, 9, true) 'Find "ImageMap" and call the slot. - wait 500 - catch - Warnlog "Unable to open context menu" - Call hCloseDocument - goto endsub - endcatch + Call hMenuSelectNr(9) Printlog " The graphic has to be selected and the context menu has to show graphics related commands" Kontext "ImageMapEditor" if Not ImageMapEditor.Exists(3) then @@ -265,6 +260,9 @@ endcase testcase tHyperlinkEdit + Warnlog "#i115132#Missing .uno Slots in context menus" + goto endsub + printlog "Context menu on hyperlinks" printlog " Open a new text document" CALL hNewDocument @@ -277,19 +275,19 @@ testcase tHyperlinkEdit Call wTypeKeys " " Call wTypeKeys "<HOME>" printlog " Open context menu on hyperlink" - Call wTypeKeys "<SHIFT F10>" + Call wTypeKeys "<SHIFT F10>" printlog " Open contextmenu, find the entry 'Edit Hyperlink', and call the slot..." - CALL hMenuFindSelect (21835, true, 18, true) 'Find "Edit Hyperlink" and call the slot. + CALL hMenuFindSelect (21835, true, 18, true) 'Find "Edit Hyperlink" and call the slot. printlog " Check if the Hyperlink-dialogue comes up correctly." - kontext "TabHyperlinkInternet" - if NOT TabHyperlinkInternet.Exists(3) then - Warnlog "No Hyperlink-Dialog visible!" + kontext "HyperlinkDialog" + if NOT HyperlinkDialog.Exists(3) then + Warnlog "No Hyperlink-Dialog visible!" else - TabHyperlinkInternet.Close - end if + HyperlinkDialog.Close + end if printlog " Close text document" - CALL hCloseDocument + CALL hCloseDocument endcase ' ----------------------------------------------------------------------------- @@ -387,6 +385,9 @@ endcase testcase tPickDrawingObjects + Warnlog "#i115132#Missing .uno Slots in context menus" + goto endsub + printlog "Context menu on drawing objects" printlog " Open a new text document" Call hNewDocument diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc index 8b6b8e8329e8..25a762297df7 100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -53,7 +53,7 @@ end sub '------------------------------------------------------------------------- -testcase tGroup_1 +testcase tGroup_1 PrintLog "- Generate a objects group via menu Format/Group/Group" @@ -80,7 +80,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_2 +testcase tGroup_2 PrintLog "- Generate a objects group via contextmenu Format/Group/Group" @@ -109,7 +109,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_3 +testcase tGroup_3 PrintLog "- Menu entries may not be enabled if less then two objects are selected." @@ -138,7 +138,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_4 +testcase tGroup_4 Dim sGroupName as String @@ -193,7 +193,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_5 +testcase tGroup_5 Dim sGroupName as String @@ -248,7 +248,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_6 +testcase tGroup_6 Dim sPositionX1 as String Dim sPositionY1 as String @@ -317,7 +317,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_7 +testcase tGroup_7 Dim sPositionX1 as String Dim sPositionY1 as String @@ -388,7 +388,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_8 +testcase tGroup_8 Dim sPositionX as String Dim sPositionY as String @@ -445,7 +445,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_9 +testcase tGroup_9 Dim sPositionX as String Dim sPositionY as String @@ -507,7 +507,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_10 +testcase tGroup_10 PrintLog "- create new objects inside the group ," PrintLog " Undo new created objects before leaving the group" @@ -554,7 +554,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_11 +testcase tGroup_11 PrintLog "- create new objects inside the group ," PrintLog " Undo new created objects after leaving the group" @@ -603,7 +603,7 @@ endcase '------------------------------------------------------------------------- -testcase tGroup_12 +testcase tGroup_12 Dim sDocument as String @@ -636,8 +636,8 @@ testcase tGroup_12 Call hCloseDocument PrintLog "- Open previous saved document " - Call hFileOpen (sDocument) - Call sMakeReadOnlyDocumentEditable + Call hFileOpen( sDocument) + Kontext "DocumentWriter" Call gMouseClick(34,34) 'set focus in the group @@ -655,7 +655,7 @@ endcase '------------------------------------------------------------------------- -testcase tEncapsulatedGroup_1 +testcase tEncapsulatedGroup_1 PrintLog "- Group objects inside the group ,Encapsulated Group" diff --git a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc index 6c4b39d0263f..7e1eee588127 100644 --- a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc +++ b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc @@ -1024,8 +1024,8 @@ testcase tDropDownLB_17 PrintLog "- Open a new document" Call hNewDocument PrintLog "- Open a word document which includes 2 entries." - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Kontext "EditInputList" if EditInputList.Exists then EditInputList.Cancel diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc index 4f2c5c39388c..168fed204ebe 100644 --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -319,8 +319,8 @@ testcase tDocumentChapter Call hNewDocument '/// Open test file chapterTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call wTypeKeys "<MOD1 End><Return>" @@ -357,12 +357,12 @@ endcase testcase tDocumentDate Dim sDate as String - + printlog "Insert/Fields/Other/Document / Date" '/// <b> Insert/Fields/Other/Document / Date </b> - + Call hNewDocument - + '/// Insert/Fields/Other/Document / Date '/// Check if the insertion is correct Call fInsertFieldsOther("TabDokumentFeldbefehle") @@ -371,14 +371,14 @@ testcase tDocumentDate Einfuegen.Click Kontext "TabDokumentFeldbefehle" TabDokumentFeldbefehle.Close - + Call wTypeKeys "<Shift Left>" EditCopy Sleep 1 if GetClipboard = "" then Warnlog "Field returns an empty string" end if - + Call hCloseDocument endcase @@ -386,65 +386,57 @@ endcase '----------------------------------------------------------------- testcase tDocumentFilename - if bAsianLan = true then - QaErrorLog "No testing with Asian language. Aborting." - goto endsub - end if - - Dim sOriginalFile as String - Dim sTestFile as String - Dim sFilename(4) as String - Dim i as Integer - - sTestFile = Convertpath (gOfficepath + "user\work\pageTest.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - sFilename(0) = "pageTest.sxw" - sFilename(1) = "pageTest" - sFilename(2) = Convertpath (gOfficepath + "user\work\") - sFilename(3) = sTestFile - - printlog "Insert/Fields/Other/Document / File name" - - Call hNewDocument - - '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - - Call wTypeKeys "<MOD1 Home>" - Call wTypeKeys "<End><Return>" - - printlog "Insert/Fields/Other/Document / File name" - printlog "Insert File name, File name without extension , Path , Path/File name" - printlog "Check if the insertion is correct" - Call fInsertFieldsOther("TabDokumentFeldbefehle") - Feldtyp.Select fGetType("File name") - for i = 0 to 3 - Kontext "TabDokumentFeldbefehle" - Formatliste.Select i+1 - Sleep 1 - Einfuegen.Click - sleep 1 - Call wTypeKeys "<F9>" - Sleep 2 - Call wTypeKeys "<Shift LEFT>" 'HOME - Sleep 1 - if fGetFieldContent() <> sFilename(i) then - Warnlog i &" - Should get " & sFilename(i) & " but get " & fGetFieldContent() - end if - Call wTypeKeys "<Delete>" - next i - Kontext "TabDokumentFeldbefehle" - TabDokumentFeldbefehle.Close - - Call hCloseDocument + + if ( bAsianLan ) then + QaErrorLog "No testing with Asian language. Aborting." + goto endsub + end if + + Dim sTestFile as String + Dim sFilename(4) as String + Dim i as Integer + + sTestFile = convertpath( gTesttoolPath & "writer\optional\input\fields\pageTest.sxw" ) + + sFilename(0) = "pageTest.sxw" + sFilename(1) = "pageTest" + sFilename(2) = hGetWorkPath() + sFilename(3) = hFileGetLocalPath( sTestFile ) + + printlog "Insert/Fields/Other/Document / File name" + + Call hNewDocument + + '/// Open test file pageTest.sxw + hFileOpenLocally( sTestFile ) + + Call wTypeKeys "<MOD1 Home>" + Call wTypeKeys "<End><Return>" + + printlog "Insert/Fields/Other/Document / File name" + printlog "Insert File name, File name without extension , Path , Path/File name" + printlog "Check if the insertion is correct" + Call fInsertFieldsOther("TabDokumentFeldbefehle") + Feldtyp.Select fGetType("File name") + for i = 0 to 3 + Kontext "TabDokumentFeldbefehle" + Formatliste.Select i+1 + Sleep 1 + Einfuegen.Click + sleep 1 + Call wTypeKeys "<F9>" + Sleep 2 + Call wTypeKeys "<Shift LEFT>" 'HOME + Sleep 1 + if fGetFieldContent() <> sFilename(i) then + Warnlog i &" - Should get " & sFilename(i) & " but get " & fGetFieldContent() + end if + Call wTypeKeys "<Delete>" + next i + Kontext "TabDokumentFeldbefehle" + TabDokumentFeldbefehle.Close + + Call hCloseDocument endcase @@ -470,8 +462,8 @@ testcase tDocumentPage Call hNewDocument '/// Open test file pageTest.sxw which includes 3 pages - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Go to the 2nd page Call wTypeKeys "<MOD1 Home>" @@ -867,22 +859,12 @@ endcase testcase tDocumentStatistics Dim sTestFile as String - Dim sOriginalFile as string Dim sStatistics() as String Dim sType as string Dim i as Integer sStatistics = Array( "2", "2", "3", "13", "2", "2", "1" ) - - sTestFile = Convertpath (gOfficepath + "user\work\statisticsTest.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\statisticsTest.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile= Convertpath (gTesttoolpath + "writer\optional\input\fields\statisticsTest.sxw") printlog "Insert/Fields/Other/Document / Statistics" '/// <b> Insert/Fields/Other/Document / Statistics </b> @@ -890,7 +872,7 @@ testcase tDocumentStatistics '/// Open test file statisticsTest.sxw which includes '/// 2 tables , 2 pictures , 22 paragraph , 1 object , '/// 2 words , 12 characters and 2 pages - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home><Down>" @@ -928,40 +910,31 @@ endcase testcase tDocumentTemplate Dim sTestFile as String - Dim sOriginalFile as string Dim sDirectory as String Dim oDirectory as String Dim sLanguage as String Dim sFormat() as String Dim sResult(6) as String Dim i as Integer - + sLanguage = fGetDirLanguage() - sTestFile = Convertpath (gOfficepath + "user\work\diploma.ott") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\diploma.ott") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - sResult(0) = fGetCateGory() + sTestFile = convertpath( gTesttoolpath + "writer\optional\input\fields\diploma.ott" ) + + sResult(0) = fGetCategory() sResult(1) = "diploma.ott" sResult(2) = "diploma" - sResult(3) = Convertpath (gOfficepath + "user\work") - sResult(4) = sTestFile + sResult(3) = convertpath( gOfficePath & "user/work" ) + sResult(4) = hGetWorkFile( sResult( 1 ) ) sResult(5) = fGetStyle() - + printlog "Insert/Fields/Other/Document / Template" '/// <b> Insert/Fields/Other/Document / Template </b> - + '/// Open test file diploma.ott - Call hFileOpen(sTestFile) - + hFileOpenLocally( sTestFile ) + Call wTypeKeys "<MOD1 Home>" - + '/// Insert/Fields/Other/Document / Template '/// Insert Category , File name , File name without extension , '/// + Path , Path/File name , Style @@ -991,10 +964,8 @@ testcase tDocumentTemplate next i Kontext "TabDokumentFeldbefehle" TabDokumentFeldbefehle.Close - - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + + hFileCloseAll() endcase '----------------------------------------------------------------- diff --git a/testautomation/writer/optional/includes/fields/w_fields3.inc b/testautomation/writer/optional/includes/fields/w_fields3.inc index 7b4e7f50722b..64261c7e1ac6 100644 --- a/testautomation/writer/optional/includes/fields/w_fields3.inc +++ b/testautomation/writer/optional/includes/fields/w_fields3.inc @@ -94,8 +94,8 @@ testcase tSetReferenceNoSelection Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd page Call wTypeKeys "<MOD1 Home>" @@ -182,8 +182,8 @@ testcase tInsertReferencePage Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd page Call wTypeKeys "<MOD1 Home>" @@ -242,8 +242,8 @@ testcase tInsertReferenceChapter Call hNewDocument '/// Open test file chapterTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd line Call wTypeKeys "<MOD1 Home>" @@ -685,8 +685,8 @@ testcase tInsertBookmarkPage Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd page Call wTypeKeys "<MOD1 Home>" @@ -743,8 +743,8 @@ testcase tInsertBookmarkChapter Call hNewDocument '/// Open test file chapterTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd line Call wTypeKeys "<MOD1 Home>" diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index d1e16a1a36be..315c6b0f96d3 100644 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -67,8 +67,8 @@ testcase tDocInformationTitle Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + new text in Title @@ -119,8 +119,8 @@ testcase tDocInformationSubject Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + text in Subject @@ -171,8 +171,8 @@ testcase tDocInformationKeywords Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + text in Keywords @@ -223,8 +223,8 @@ testcase tDocInformationDescription Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + text in Description @@ -264,23 +264,13 @@ testcase tDocInformationUserDefined QAErrorLog "#i112077#Tabpage 'Custom properties' has no declaration" goto endsub Dim sTestFile as String - Dim sOriginalFile as string Dim sVarResult() as String Dim sFixResult() as String Dim i as integer Dim j as Integer j = UBound(sVarResult) - sTestFile = Convertpath (gOfficepath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sVarResult = Array( _ "A1" , _ "B2" , _ @@ -301,7 +291,7 @@ testcase tDocInformationUserDefined Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// File / Properties / Description , input some '/// + text in Description @@ -344,26 +334,17 @@ endcase testcase tDocInformationCreated - Dim sTestFile as String - Dim sOriginalFile as String Dim sFirstName as String Dim sLastName as String Dim sFirstName1 as String Dim sLastName1 as String Dim sVarResult(3) as String Dim sFixResult(3) as String + dim sTestFile as string Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sVarResult(0) = sFirstName1 + " " + sLastName1 sVarResult(1) = fGetDate1(Date) @@ -378,8 +359,8 @@ testcase tDocInformationCreated Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call fFindWord ("Created") Call wTypeKeys "<End><Right><Down><Down><Down><Home>" @@ -458,7 +439,6 @@ endcase testcase tDocInformationModified Dim sTestFile as String - Dim sOriginalFile as String Dim sSaveasFile as String Dim sFirstName as String Dim sLastName as String @@ -469,15 +449,7 @@ testcase tDocInformationModified Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sSaveasFile = ConvertPath (gOfficePath + "user\work\fields_docinfos1.sxw" ) sVarResult(0) = sFirstName1 + " " + sLastName1 @@ -495,7 +467,7 @@ testcase tDocInformationModified Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call hFileSaveAsKill (sSaveAsFile) Call fFindWord ("Modified") @@ -595,7 +567,6 @@ testcase tDocInformationModifiedSavefile goto endsub Dim sTestFile as String - Dim sOriginalFile as string Dim sSaveasFile as String Dim sFirstName as String Dim sLastName as String @@ -606,15 +577,7 @@ testcase tDocInformationModifiedSavefile Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sSaveasFile = ConvertPath (gOfficePath + "user\work\fields_docinfos1.sxw" ) sVarResult(0) = sFirstName1 + " " + sLastName1 @@ -632,7 +595,7 @@ testcase tDocInformationModifiedSavefile Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call fFindWord ("Modified") Call wTypeKeys "<End><Right><Down><Down><Down><Home>" @@ -715,7 +678,6 @@ endcase testcase tDocInformationPrinted Dim sTestFile as String - Dim sOriginalFile as String Dim sFirstName as String Dim sLastName as String Dim sFirstName1 as String @@ -725,17 +687,7 @@ testcase tDocInformationPrinted Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sVarResult(0) = sFirstName1 + " " + sLastName1 sVarResult(1) = fGetDate1(Date) @@ -749,7 +701,7 @@ testcase tDocInformationPrinted Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call fFindWord ("Last printed") Call wTypeKeys "<End><Right><Down><Down><Down><Home>" @@ -842,7 +794,6 @@ endcase testcase tDocInformationRevisionnumber Dim sTestFile as String - Dim sOriginalFile as string Dim sSaveasFile as String Dim sFirstName as String Dim sLastName as String @@ -854,15 +805,7 @@ testcase tDocInformationRevisionnumber sFirstName1 = "Test1" : sLastName1 = "Test2" sVarResult = "17" : sFixResult = "4" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformationRevisionnumber.sxw" ) if FileExists ( sSaveAsFile ) then app.kill ( sSaveAsFile ) @@ -873,7 +816,7 @@ testcase tDocInformationRevisionnumber Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Change author to author : Test2 Test1 ToolsOptions @@ -947,21 +890,12 @@ endcase testcase tDocInformationTotaleditingtime Dim sTestFile as String - Dim sOriginalFile as string Dim sSaveasFile as String Dim sVarResult as String Dim sFixResult as String sFixResult = "00:29:05" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformationRevisionnumber.sxw" ) if FileExists ( sSaveAsFile ) then app.kill ( sSaveAsFile ) @@ -972,7 +906,7 @@ testcase tDocInformationTotaleditingtime Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Save the file as another file Call hFileSaveAsKill(sSaveAsFile) diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc index 334d01906307..75f94e8a3351 100644 --- a/testautomation/writer/optional/includes/fields/w_fields5.inc +++ b/testautomation/writer/optional/includes/fields/w_fields5.inc @@ -722,7 +722,7 @@ testcase tVariablesDDEFieldManual '/// Open the test file which you just closed , add something , '/// Save the file - Call hFileOpen(sDDEFile) + hFileOpenLocally( sDDEFile) Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "XYZ" FileSave @@ -818,7 +818,7 @@ testcase tVariablesDDEFieldAutomatic '/// Open the test file which you just closed , add something , '/// Save the file - Call hFileOpen(sDDEFile) + hFileOpenLocally( sDDEFile) Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "XYZ" FileSave diff --git a/testautomation/writer/optional/includes/fields/w_fields6.inc b/testautomation/writer/optional/includes/fields/w_fields6.inc index e310b67740af..f29eff451edb 100644 --- a/testautomation/writer/optional/includes/fields/w_fields6.inc +++ b/testautomation/writer/optional/includes/fields/w_fields6.inc @@ -795,8 +795,8 @@ testcase tFunctionsCombineCharacter Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "<Right>" diff --git a/testautomation/writer/optional/includes/fields/w_fields7.inc b/testautomation/writer/optional/includes/fields/w_fields7.inc index 5893e324366b..c5b21d00d5eb 100644 --- a/testautomation/writer/optional/includes/fields/w_fields7.inc +++ b/testautomation/writer/optional/includes/fields/w_fields7.inc @@ -119,8 +119,8 @@ testcase tL10NtestAboveBelow Call hNewDocument '/// Open test file AboveBelow.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Check if reference above/below is changed after language is changed @@ -182,7 +182,6 @@ testcase tL10NtestDate end if Dim sTestFile as String - Dim sOriginalFile as string Dim sDate() as String Dim iCountry() as Integer Dim i , j as Integer @@ -215,17 +214,7 @@ testcase tL10NtestDate ExtrasOptionenDlg.Cancel Call hCloseDocument - sTestFile = Convertpath (gOfficepath + "user\work\Date.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\Date.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - + sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\Date.sxw") sDate = Array( _ "Tuesday, August 3, 2004" , _ "mardi 3 août 2004" , _ @@ -248,7 +237,7 @@ testcase tL10NtestDate Call hNewDocument '/// Open test file Date.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Check if Date is changed after language is changed j = UBound(iCountry) @@ -304,7 +293,6 @@ testcase tL10NtestTime end if Dim sTestFile as String - Dim sOriginalFile as string Dim sTime() as String Dim iCountry() as Integer Dim i as Integer @@ -338,17 +326,8 @@ testcase tL10NtestTime ExtrasOptionenDlg.Cancel Call hCloseDocument - sTestFile = Convertpath (gOfficepath + "user\work\Time.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\Time.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - + + sTestFile = gTesttoolpath + "writer\optional\input\fields\Time.sxw" sTime = Array( _ "04:46:08 PM" , _ "04:46:08 PM" , _ @@ -371,7 +350,7 @@ testcase tL10NtestTime Call hNewDocument '/// Open test file Time.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Check if time is changed after language is changed j = UBound(iCountry) diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc index eb2de884a8cc..df216304ea2e 100644 --- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc +++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc @@ -243,9 +243,9 @@ testcase tFormatCharacter3 Call hCloseDocument printlog "reopen previous saved document and check saved character format" if gApplication = "WRITER" then - Call hFileOpen ( gOfficePath + "user\work\format1.odt" ) + hFileOpen( gOfficePath & "user\work\format1.odt" ) else - Call hFileOpen ( gOfficePath + "user\work\format1.odm" ) + hFileOpen( gOfficePath & "user\work\format1.odm" ) end if Call wTypeKeys "<Mod1 Home><Right>" Wait 500 @@ -343,10 +343,10 @@ testcase tFormatStyles1 '/// Write 'Style Bold' - execute Context menu 'Style Bold' Call wTypeKeys "Style Bold" Call wTypeKeys "<Shift Home>" - Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. - Call hMenuFindSelect (".uno:Bold", true, 1, false) 'Find 'Bold' and call the slot. + Kontext "DocumentWriter" + DocumentWriter.OpenContextMenu + Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. + if hMenuFindSelect (".uno:Bold", true, 1, false) = true then 'Find 'Bold' and call the slot. '/// Check if changes to style have been made /// Kontext "TextObjectbar" if Fett.Getstate(2) = 0 then @@ -354,114 +354,121 @@ testcase tFormatStyles1 end if Call wTypeKeys "<End><Mod1 Shift X>" - wait 500 + wait 500 Call wTypeKeys "<Return>" + endif printlog "- Style 'Italic' " '/// Write 'Style Italic' - execute Context menu 'Style Italic' Call wTypeKeys "Style Italic" Call wTypeKeys "<Shift Home>" - Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. - Call hMenuFindSelect (".uno:Italic", true, 2, false) 'Find 'Italic' and call the slot. - ' /// Check if changes to style have been made /// + Kontext "DocumentWriter" + DocumentWriter.OpenContextMenu + Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. + if hMenuFindSelect (".uno:Italic", true, 2, false) = true then 'Find 'Italic' and call the slot. + ' /// Check if changes to style have been made /// Kontext "TextObjectbar" if Kursiv.Getstate(2) = 0 then Warnlog "#58722#Style 'Italic' with context menu has not been set!" end if - Call wTypeKeys "<End><Right>" - Call wTypeKeys "<Return>" + Call wTypeKeys "<End><Right>" + Call wTypeKeys "<Return>" + end if printlog "- Style 'Underline' " '/// Write 'Style Underline' - execute Context menu 'Style Underline' Call wTypeKeys "Style Underline" Call wTypeKeys "<Shift Home>" - Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. - Call hMenuFindSelect (".uno:Underline", true, 4, false) 'Find 'Underline' and call the slot. - ' /// Check if changes to style have been made /// - FormatCharacter - Kontext - Active.Setpage TabFontEffects - Kontext "TabFontEffects" - if Underline.GetSelIndex <> 2 then Warnlog "Style 'Underline' with context menu has not been set!" - TabFontEffects.Cancel - Call wTypeKeys "<End><Right>" - Call wTypeKeys "<Return>" - + Kontext "DocumentWriter" + DocumentWriter.OpenContextMenu + Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. + if hMenuFindSelect (".uno:Underline", true, 4, false) = true then 'Find 'Underline' and call the slot. + ' /// Check if changes to style have been made /// + FormatCharacter + Kontext + Active.Setpage TabFontEffects + Kontext "TabFontEffects" + if Underline.GetSelIndex <> 2 then Warnlog "Style 'Underline' with context menu has not been set!" + TabFontEffects.Cancel + Call wTypeKeys "<End><Right>" + Call wTypeKeys "<Return>" + end if + printlog "- Style 'Overline' " '/// Write 'Style Overline' - execute Context menu 'Style Strikethrough' Call wTypeKeys "Style Overline" Call wTypeKeys "<Shift Home>" - Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. - Call hMenuFindSelect (".uno:Overline", true, 3, false) 'Find 'Overline' and call the slot. - ' /// Check if changes to style have been made /// - FormatCharacter - Kontext - Active.Setpage TabFontEffects - Kontext "TabFontEffects" - if Overline.GetSelIndex <> 2 then Warnlog "Style 'Overline' with context menu has not been set!" - TabFontEffects.Cancel - Call wTypeKeys "<End><Right>" - Call wTypeKeys "<Return>" + Kontext "DocumentWriter" + DocumentWriter.OpenContextMenu + Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. + if hMenuFindSelect (".uno:Overline", true, 3, false) = true then 'Find 'Overline' and call the slot. + ' /// Check if changes to style have been made /// + FormatCharacter + Kontext + Active.Setpage TabFontEffects + Kontext "TabFontEffects" + if Overline.GetSelIndex <> 2 then Warnlog "Style 'Overline' with context menu has not been set!" + TabFontEffects.Cancel + Call wTypeKeys "<End><Right>" + Call wTypeKeys "<Return>" + end if printlog "- Style 'StrikeThrough' " '/// Write 'Style Strikethrough' - execute Context menu 'Style Strikethrough' Call wTypeKeys "Style Strikethrough" Call wTypeKeys "<Shift Home>" Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. - Call hMenuFindSelect (".uno:Strikeout", true, 5, false) 'Find 'Strikethrough' and call the slot. - ' /// Check if changes to style have been made /// - FormatCharacter - Kontext - Active.Setpage TabFontEffects - Kontext "TabFontEffects" - if StrikeThrough.GetSelIndex <> 2 then Warnlog "Style 'StrikeThrough' with context menu has not been set!" - TabFontEffects.Cancel - Call wTypeKeys "<End>" - Call wTypeKeys "<Right><Return>" + DocumentWriter.OpenContextMenu + Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. + if hMenuFindSelect (".uno:Strikeout", true, 5, false) = true then 'Find 'Strikethrough' and call the slot. + ' /// Check if changes to style have been made /// + FormatCharacter + Kontext + Active.Setpage TabFontEffects + Kontext "TabFontEffects" + if StrikeThrough.GetSelIndex <> 2 then Warnlog "Style 'StrikeThrough' with context menu has not been set!" + TabFontEffects.Cancel + Call wTypeKeys "<End>" + Call wTypeKeys "<Right><Return>" + end if printlog "- Style 'Shadow' " '/// Write 'Style Shadow' - execute Context menu 'Style Shadow' Call wTypeKeys "Style Shadow" Call wTypeKeys "<Shift Home>" Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. - Call hMenuFindSelect (".uno:Shadowed", true, 6, false) 'Find 'Shadowed' and call the slot. - ' /// Check if changes to style have been made /// - FormatCharacter - Kontext - Active.Setpage TabFontEffects - Kontext "TabFontEffects" - if Shadow.IsChecked = False then Warnlog "Style 'Shadow' with context menu has not been set!" - TabFontEffects.Cancel - Call wTypeKeys "<End><Right>" - Call wTypeKeys "<Return>" + DocumentWriter.OpenContextMenu + Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. + if hMenuFindSelect (".uno:Shadowed", true, 6, false) = true then 'Find 'Shadowed' and call the slot. + ' /// Check if changes to style have been made /// + FormatCharacter + Kontext + Active.Setpage TabFontEffects + Kontext "TabFontEffects" + if Shadow.IsChecked = False then Warnlog "Style 'Shadow' with context menu has not been set!" + TabFontEffects.Cancel + Call wTypeKeys "<End><Right>" + Call wTypeKeys "<Return>" + end if printlog "- Style 'Outline' " '/// Write 'Style Outline' - execute Context menu 'Style Outline' Call wTypeKeys "Style Outline" Call wTypeKeys "<Shift Home>" Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. - Call hMenuFindSelect (".uno:OutlineFont", true, 7, false) 'Find 'Outline' and call the slot. - ' /// Check if changes to style have been made /// - FormatCharacter - Kontext - Active.Setpage TabFontEffects - Kontext "TabFontEffects" - if Outline.IsChecked = false then Warnlog "Style 'Outline' with context menu has not been set!" - TabFontEffects.Cancel - + DocumentWriter.OpenContextMenu + Call hMenuFindSelect (".uno:StyleMenu", true, 5, false) 'Find 'Style' and call the slot. + if hMenuFindSelect (".uno:OutlineFont", true, 7, false) = true then 'Find 'Outline' and call the slot. + ' /// Check if changes to style have been made /// + FormatCharacter + Kontext + Active.Setpage TabFontEffects + Kontext "TabFontEffects" + if Outline.IsChecked = false then Warnlog "Style 'Outline' with context menu has not been set!" + TabFontEffects.Cancel + end if + printlog "Close Document." Call hCloseDocument endcase @@ -579,9 +586,9 @@ testcase tFormatCharacter Call hCloseDocument printlog "re-open previous saved document" if gApplication = "WRITER" then - Call hFileOpen ( gOfficePath + "user\work\format1.odt" ) + hFileOpen( gOfficePath & "user\work\format1.odt" ) else - Call hFileOpen ( gOfficePath + "user\work\format1.odm" ) + hFileOpen( gOfficePath & "user\work\format1.odm" ) end if Call wTypeKeys "<Mod1 Home><Right>" Wait 500 diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index 84a5c5281f8b..a7393d50f6df 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -348,7 +348,7 @@ testcase tFormatPage_6 Call hNewDocument - Call hFileOpen(gOfficepath + "user\work\tFormatPage_6.odt") + hFileOpen( gOfficepath + "user\work\tFormatPage_6.odt") '/// Check if Pre-defined formats are correct fFormatPageWriter("TabSeite") @@ -602,8 +602,8 @@ testcase tFormatPage_11 '/// Open a test file , '/// + There are 2 pictures in 2 pages separately , '/// + and they are anchored as character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Right to left" @@ -662,8 +662,8 @@ testcase tFormatPage_12 '/// Open a test file , '/// + there are 2 pictures in 2 pages separately , and they are anchored as character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Mirrored" @@ -724,8 +724,8 @@ testcase tFormatPage_13 '/// Open a test file , '/// + there are 2 pictures in 2 pages separately - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Only right" @@ -781,8 +781,8 @@ testcase tFormatPage_14 '/// Open a test file , '/// + there are 2 pictures in 2 pages separately - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Only left" diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc index 290b1a395b94..a191efc726cf 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc @@ -60,8 +60,8 @@ testcase tFormatPage_16 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -151,8 +151,8 @@ testcase tFormatPage_17 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -255,8 +255,8 @@ testcase tFormatPage_18 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -340,8 +340,8 @@ testcase tFormatPage_19 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -417,8 +417,8 @@ testcase tFormatPage_20 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -507,8 +507,8 @@ testcase tFormatPage_21 '/// AutoFit height - Check (Footer,multiline content) '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -613,8 +613,8 @@ testcase tFormatPage_22 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -697,8 +697,8 @@ testcase tFormatPage_23 '/// AutoFit height - UnCheck (Footer,multiline content) '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc index 784f6dad28cc..df0f810f9093 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc @@ -71,8 +71,8 @@ testcase tFormatPage_29 '/// Open test file testHeaderContent29.sxw '/// + (The test file include 2 pages , and the '/// + content in header are different ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage header , check 'same content left/right' fFormatPageWriter("TabKopfzeile") @@ -159,8 +159,8 @@ testcase tFormatPage_30 '/// Open test file testHeaderContent30.sxw '/// + (The test file include 2 pages , and the '/// + content in header is same ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage header , Uncheck 'same content left/right' fFormatPageWriter("TabKopfzeile") @@ -226,8 +226,8 @@ testcase tFormatPage_31 '/// Open test file testFooterContent31.sxw '/// + (The test file include 2 pages , and the content '/// + in footer are different ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// + formatPage , tabpage footer , check 'same content left/right' fFormatPageWriter("TabFusszeile") @@ -314,8 +314,8 @@ testcase tFormatPage_32 '/// Open test file testFooterContent32.sxw '/// + (The test file include 2 pages , and the '/// + content in footer is same ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage footer , Uncheck 'same content left/right' fFormatPageWriter("TabFusszeile") @@ -743,8 +743,8 @@ testcase tFormatPage_39 '/// Open test file testColumnInPage.sxw '/// + (The test file includes 2 pages , some text '/// + is in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage columns , change column to 3 via controls fFormatPageWriter("TabSpalten") @@ -808,8 +808,8 @@ testcase tFormatPage_40 '/// Open test file testColumnInPage.sxw '/// + (The test file includes 2 pages , some text is '/// + in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage columns , change column to 3 via spinfield fFormatPageWriter("TabSpalten") @@ -882,8 +882,8 @@ testcase tFormatPage_41 '/// Open test file testColumnInPage2.sxw '/// + (The test file includes 2 pages , some text is '/// + in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Create 3 with different columns . formatPage , '/// + tabpage columns , set 3 columns @@ -973,8 +973,8 @@ testcase tFormatPage_42 '/// Open test file testColumnInPage2.sxw '/// + (The test file includes 2 pages , some text is '/// + in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage columns , set 3 columns fFormatPageWriter("TabSpalten") @@ -1136,8 +1136,8 @@ testcase tFormatPage_45 '/// Open test file testSeparatorLine.sxw '/// + (The test file includes 6 columns , some '/// + test text lllll... is in 2nd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Kontext EditSearchAndReplace @@ -1263,7 +1263,7 @@ testcase tFormatPage_46 Call hCloseDocument Call hNewDocument - Call hFileOpen(gOfficepath + "user\work\tFormatPage_46.odt") + hFileOpen( gOfficepath + "user\work\tFormatPage_46.odt") '/// Check if the setting are still kept fFormatPageWriter("TabSpalten") diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc index 9b800e3bad4b..728cd204ed50 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc @@ -375,8 +375,8 @@ testcase tFormatPage_53 '/// Open test file testColumnVertical.sxw '/// + There are 8 columns in the page , and a test '/// + word is in 3rd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage page, select right to left (vertical) Call fFormatPageWriter("TabSeite") @@ -763,8 +763,8 @@ testcase tFormatPage_60 Call hCloseDocument Call hNewDocument - Call hFileOpen(gOfficepath + "user\work\tFormatPage_60.odt") - Call sMakeReadOnlyDocumentEditable + hFileOpen( gOfficepath + "user\work\tFormatPage_60.odt") + '/// check if the configuration is all right fFormatPageWriter("TabUmrandung") diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc index 4fa007cfc4b0..7c31482e37af 100644 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc @@ -366,8 +366,8 @@ testcase tParagraphIndent5 '/// Open the test file '/// This file includes 2 paragraphs , and the end of 2nd paragraph is in 1st page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to 2nd paragraph Kontext @@ -426,8 +426,8 @@ testcase tParagraphIndent6 '/// Open the test file '/// This file includes 2 paragraphs , and the end of 2nd paragraph is in 1st page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to 1st paragraph Kontext @@ -494,8 +494,8 @@ testcase tParagraphIndent7 '/// if the spacing is adopted 1cm ,2nd paragrahp will be in 1st page '/// if the spacing is adopted 2cm ,2nd paragrahp part will be in 1st page , part will be in 2nd page '/// if the spacing is adopted 3cm ,2nd paragrahp will be in 2nd page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to the end of the 1st paragraph Kontext @@ -582,8 +582,8 @@ testcase tParagraphIndent8 '/// if the spacing is adopted 1cm ,2nd paragrahp will be in 1st page '/// if the spacing is adopted 2cm ,2nd paragrahp part will be in 1st page , part will be in 2nd page '/// if the spacing is adopted 3cm ,2nd paragrahp will be in 2nd page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to the end of the 1st paragraph Kontext @@ -642,8 +642,8 @@ testcase tParagraphIndent9 '/// Open the test file '/// This file includes 8 lines , '/// + when the spacing is single line , the 8 lines should be in 1 page as design. - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , select single line in Line spacing Call fFormatParagraph("TabEinzuegeUndAbstaende") @@ -683,8 +683,8 @@ testcase tParagraphIndent10 '/// This file includes 8 lines '/// when the spacing is 1.5 lines , '/// + the last 2(or 3) lines should be in 2nd page. - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , select 1.5 lines in Line spacing Call fFormatParagraph("TabEinzuegeUndAbstaende") @@ -753,8 +753,8 @@ testcase tParagraphIndent11 '/// This file includes 8 lines '/// when the spacing is Double lines , the first 4 lines should be in 1st page '/// + the last 4 lines should be in 2nd page. - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , select Double lines in Line spacing Call fFormatParagraph("TabEinzuegeUndAbstaende") @@ -833,8 +833,8 @@ testcase tParagraphIndent12 '/// This file includes 8 lines '/// when the spacing Proportional is more than 200% , '/// + then it will change to be Double line automatically - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , '/// + select Proportional in Line spacing , and input 300% @@ -907,8 +907,8 @@ testcase tParagraphIndent13 '/// This file includes 8 lines and 1 pic is anchored as character in 1st line '/// when the spacing is At least to 4cm, there should be 1 line/page '/// + and the pic should move down - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Get the original coordinate-Y Call wTypeKeys ( "<Shift F4>" ) @@ -976,8 +976,8 @@ testcase tParagraphIndent14 '/// This file includes 8 lines and 1 pic is anchored as character in 1st line '/// when the spacing is leading to 4cm, there should be 1 line/page '/// + and the pic should NOT move - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Get the original coordinate-Y Call wTypeKeys ( "<Shift F4>" ) @@ -1042,8 +1042,8 @@ testcase tParagraphIndent15 '/// Open the test file '/// + This file includes 8 lines , and font size is 12 - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , '/// + select Fixed lines in Line spacing @@ -1112,8 +1112,8 @@ testcase tParagraphIndent16 '/// + You will find out the "He2 heard quiet steps" '/// + isn't at the same line with the context left it . '/// + There is a pic anchored "He2" . - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Get the original location for the pic Call wTypeKeys ( "<Shift F4>" ) @@ -1171,8 +1171,8 @@ testcase tParagraphIndent17 '/// In Tools/Optionis/Text Document/Compatibility, '/// + the 'Add spacing between paragarph and talbes' '/// + should be checked - Call hFileOpen(sTestFile1) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile1) + ToolsOptions Call hToolsOptions("WRITER","COMPATIBILITY") @@ -1193,8 +1193,8 @@ testcase tParagraphIndent17 '/// In Tools/Optionis/Text Document/Compatibility, '/// + the 'Add spacing between paragarph and talbes' '/// + should NOT be checked - Call hFileOpen(sTestFile2) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile2) + ToolsOptions Call hToolsOptions("WRITER","COMPATIBILITY") diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc index dccebdcf930e..d204f8f2e02c 100644 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc @@ -29,31 +29,6 @@ '* '* short description : Test the functionality of Paragraph Formatting - 2 '* -'************************************************************************ -'* -' #1 tParagraphAlignment1 'Test 'Left' alignment -' #1 tParagraphAlignment2 'Test 'Right' alignment -' #1 tParagraphAlignment3 'Test 'Center' alignment -' #1 tParagraphAlignment4 'Test 'Justified' alignment - Default -' #1 tParagraphAlignment5 'Test 'Justified' alignment - Centered -' #1 tParagraphAlignment6 'Test 'Justified' alignment - Justified -' #1 tParagraphAlignment7 'Test 'Expand single word' -' #1 tParagraphAlignment8 'Test Uncheck 'Snap to text grid(if active)' -' #1 tParagraphAlignment9 'Test Check 'Snap to text grid(if active)' -' #1 tParagraphTextFlow1 'Hyphenation must be processed while entering text WITHOUT inquiry -' #1 tParagraphTextFlow2 'Hyphenation - Characters at line end -' #1 tParagraphTextFlow3 'Hyphenation - Characters at line begin -' #1 tParagraphTextFlow4 'Hyphenation - maxinum number of consecutive typhens -' #1 tParagraphTextFlow5 'Paragraph break before Column -' #1 tParagraphTextFlow6 'Paragraph break after Column -' #1 tParagraphTextFlow7 'Paragraph break before Page -' #1 tParagraphTextFlow8 'Paragraph break after Page -' #1 tParagraphTextFlow9 'Do not split paragraph -' #1 tParagraphTextFlow10 'Keep with next paragraph -' #1 tParagraphTextFlow11 'Orphan control -' #1 tParagraphTextFlow12 'widow control -' #1 tParagraphTextFlow13 'Special test for Hyphenation -'* '\*********************************************************************** testcase tParagraphAlignment1 @@ -70,8 +45,7 @@ testcase tParagraphAlignment1 '/// + Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) 'Get the original coordinate-X Call wTypeKeys ( "<Shift F4>" ) @@ -119,8 +93,7 @@ testcase tParagraphAlignment2 '/// + Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the laste character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// + Format/Paragraph / Alignment , choose Right/Bottom option Call fFormatParagraph("TabAusrichtungAbsatz") @@ -156,8 +129,7 @@ testcase tParagraphAlignment3 '/// + Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// + Format/Paragraph / Alignment , choose Center option Call fFormatParagraph("TabAusrichtungAbsatz") @@ -196,8 +168,7 @@ testcase tParagraphAlignment4 '/// Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the last character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys ( "<Shift F4>" ) Sleep 1 @@ -264,8 +235,7 @@ testcase tParagraphAlignment5 '/// Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the last character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Alignment , '/// + choose Justified option , and select centered in last line @@ -307,8 +277,7 @@ testcase tParagraphAlignment6 '/// Open the test file '/// + This file includes 1 paragraphs, '/// + and 2 pics are in 2nd line - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys ( "<Shift F4>" ) Call wTypeKeys "<TAB>" @@ -374,8 +343,7 @@ testcase tParagraphAlignment7 '/// + This file includes 1 paragraphs , '/// + there is only 1 word - "That" in last line , '/// + and a drawring object is anchored as character after "That" - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) printlog "Select the object." Sleep 1 @@ -441,8 +409,7 @@ testcase tParagraphAlignment8 '/// Open the test file '/// + This file includes 1 paragraphs , '/// + and a drawring object is anchored as character after "That" - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Get the drawing object original position /// Call wTypeKeys ( "<Shift F4>" ) @@ -512,8 +479,7 @@ testcase tParagraphAlignment9 '/// Open the test file '/// + This file includes 1 paragraphs , '/// + and a drawring object is anchored as character after "That" - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Get the drawing object original position /// Call wTypeKeys ( "<Shift F4>" ) @@ -578,8 +544,7 @@ testcase tParagraphTextFlow1 '/// Open the test file '/// + This file includes 2 words : AAA and Kilometerhigh - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) 'the focus is in front of Kilometerhigh Call wTypeKeys "<Home>" @@ -607,8 +572,7 @@ testcase tParagraphTextFlow1 Call hCloseDocument Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 2. Test there is the Hyphenation configuratioin '/// + Format/Paragraph / Text Flow , @@ -657,8 +621,7 @@ testcase tParagraphTextFlow2 '/// Open the test file '/// + This file includes 2 words : AAA and Kilometerhigh - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 1.Test Characters at line end ==> 6 '/// + Format/Paragraph / Text Flow , @@ -689,8 +652,7 @@ testcase tParagraphTextFlow2 Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 2.Test Characters at line end ==> 8 '/// + Format/Paragraph / Text Flow , @@ -735,8 +697,7 @@ testcase tParagraphTextFlow3 '/// Open the test file '/// + This file includes 2 words : AAA and Kilometerhigh - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 1.Test Characters at line begin ==> 4 '/// + Format/Paragraph / Text Flow , @@ -766,8 +727,8 @@ testcase tParagraphTextFlow3 Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// 2.Test Characters at line end ==> 6 '/// + Format/Paragraph / Text Flow , @@ -817,8 +778,7 @@ testcase tParagraphTextFlow4 '/// Open the test file '/// + This file includes 4 words : KiloAmterhigh1 kiloAmeterhigh2 kiloAmeterhigh3 kiloAmeterhigh4 '/// + the words' length is longer then page length - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 1.Test maxinum number of consecutive typhens (default => 0) '/// + Format/Paragraph / Text Flow , @@ -935,8 +895,7 @@ testcase tParagraphTextFlow5 '/// + There are 2 columns/page ,includes 2 paragraph '/// + the 1st paragraph is in 1st and 2nd column '/// + the 2nd paragraph is is 2nd and 3rd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set the focus to 2nd paragraph Kontext @@ -987,8 +946,7 @@ testcase tParagraphTextFlow6 '/// + There are 2 columns/page ,includes 1 paragraph '/// + the paragraph is in 1st and 2nd column '/// + and it is NOT full of 2nd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Set 'Breaks' enable @@ -1031,8 +989,7 @@ testcase tParagraphTextFlow7 '/// Open the test file '/// + There are 2 paragraphs in 1 page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set the focus to 2nd paragraph Kontext @@ -1092,8 +1049,7 @@ testcase tParagraphTextFlow8 '/// Open the test file '/// + There is 1 paragraph in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Set 'Breaks' enable @@ -1139,8 +1095,7 @@ testcase tParagraphTextFlow9 '/// Open the test file '/// + There is 1 paragraph which cross 2 pages - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" Call fFindWord("She") @@ -1173,8 +1128,7 @@ testcase tParagraphTextFlow9 PrintLog "- Check Don't split paragraph" Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" @@ -1225,8 +1179,7 @@ testcase tParagraphTextFlow10 '/// Open the test file '/// There are 2 paragraphes in the file , 1st one crosses '/// + 1st and 2nd page , 2nd one is in 2nd page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) EditSearchAndReplace Kontext "FindAndReplace" SearchFor.SetText "He1" @@ -1269,8 +1222,7 @@ testcase tParagraphTextFlow10 Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) PrintLog "- Check Keep with next paragraph" '/// 2. Test checking "Keep with next paragraph" @@ -1331,8 +1283,7 @@ testcase tParagraphTextFlow11 '/// Open the test file '/// + There is 1 paragraph (8 lines) in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Check 'Orphan control' , set 3 in 'Lines' @@ -1385,8 +1336,7 @@ testcase tParagraphTextFlow12 '/// Open the test file '/// + There is 1 paragraph (8 lines) in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Check 'Widow control' , set 3 in 'Lines' @@ -1436,8 +1386,7 @@ testcase tParagraphTextFlow13 '/// Open the test file '/// + There is 1 word TABC in the end of the first line - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Press spaces in the head of the first line , we hope '/// + the whole word - 'TABC' will go to 2nd line at one time diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc index 77af9b0a0301..37c79948a1cc 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 ) diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc index bacd2dd1d8af..a16949d37851 100644 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc @@ -67,8 +67,7 @@ testcase tHHNoSelction_1 '/// Open a test file , which includes some Korean characters '/// + and some Chinese characters - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sTestFile) '/// Set focus before the 3rd character Call wTypeKeys "<MOD1 Home>" @@ -137,8 +136,7 @@ testcase tHHNoSelction_2 '/// Open a test file , which includes some English , '/// + Germany , French , Korean and Chinese characters '/// + (Korean is before Chinese) - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally(sTestFile) '/// Set focus to the beginning Call wTypeKeys "<MOD1 Home>" @@ -195,8 +193,8 @@ testcase tHHNoSelction_3 '/// Open a test file , which includes some English , '/// + Germany , French , Korean and Chinese characters '/// + (Chinese is before Korean) - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the beginning Call wTypeKeys "<MOD1 Home>" @@ -250,8 +248,8 @@ testcase tHHNoSelction_4 '/// Open a test file , which includes some English , '/// + Germany , French characters . '/// + There are no Chinese and Korean - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the beginning Call wTypeKeys "<MOD1 Home>" @@ -291,8 +289,8 @@ testcase tHHNoSelction_5 Call hNewDocument '/// Open a test file , which includes some Chinese and Korean - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the end of the file Call wTypeKeys "<MOD1 End>" @@ -333,8 +331,8 @@ testcase tHHNoSelction_6 '/// Open a test file , which includes some Chinese and Korean, '/// + the 3rd character in 1st line isn't convertible - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the 3rd character (korean) Call wTypeKeys "<MOD1 Home>" @@ -398,8 +396,8 @@ testcase tHHNoSelction_7 '/// Open a test file , which includes some Chinese and Korean, '/// + the 3rd character in 2nd line isn't convertible - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the 3rd chinese character Call wTypeKeys "<MOD1 Home><Down><Home>" @@ -466,8 +464,8 @@ testcase tHHSingleSelction_1 Call hNewDocument '/// Open a test file , which includes some Chinese and Korean - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Select from 4th to 7th character Call wTypeKeys "<MOD1 Home>" @@ -527,8 +525,8 @@ testcase tHHMultiSelction_1 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Do a multi Selectiong to the charcters -- ìž…ë ¥ Call fFindWord(sMultiWord) @@ -573,8 +571,8 @@ testcase tHHTextBox_1 '/// Open a test file , which includes a text box and '/// + some Korean chacters in the text box - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Tools / HangulHanjaConversion , the below 4 checkboxes ralated '/// + ruby should be disabled . @@ -645,8 +643,8 @@ testcase tHHDrawBox_1 '/// Open a test file , which includes a draw box and '/// + some Korean chacters in the text box - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Tools / HangulHanjaConversion , the below 4 checkboxes ralated '/// + ruby should be disabled . '/// -> 'Hanja As Ruby Above Hangul' diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc index 26437f17f920..dface018692f 100644 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc @@ -80,7 +80,7 @@ testcase tHHConversion_1 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , @@ -129,7 +129,7 @@ testcase tHHConversion_2 '/// Open a test file , which includes some '/// + Chinese character and Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , check hanja only . @@ -180,7 +180,7 @@ testcase tHHConversion_3 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , check Hanja(Hangul) @@ -232,7 +232,7 @@ testcase tHHConversion_4 '/// Open a test file , which includes some '/// + Chinese character and Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , check Hanja(Hangul). @@ -284,7 +284,7 @@ testcase tHHConversion_5 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , check Hangul(Hanja) , @@ -337,7 +337,7 @@ testcase tHHConversion_6 '/// Open a test file , which includes some '/// + Chinese character and Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , check Hangul(Hanja), @@ -390,7 +390,7 @@ testcase tHHConversion_7 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Above Hangul' , @@ -450,7 +450,7 @@ testcase tHHConversion_8 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Above Hangul' , @@ -510,7 +510,7 @@ testcase tHHConversion_9 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Below Hangul' , @@ -570,7 +570,7 @@ testcase tHHConversion_10 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Below Hangul' , @@ -630,7 +630,7 @@ testcase tHHConversion_11 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Above Hanja' , @@ -690,7 +690,7 @@ testcase tHHConversion_12 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Above Hanja' , @@ -750,7 +750,7 @@ testcase tHHConversion_13 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Below Hanja' , @@ -810,7 +810,7 @@ testcase tHHConversion_14 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Below Hanja' , @@ -865,7 +865,7 @@ testcase tHHConversion_15 '/// Open a test file , which includes some Korean chacters . '/// + Set focus before Korean character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , @@ -913,7 +913,7 @@ testcase tHHConversion_16 '/// Open a test file , which includes some Chinese chacters . '/// + Set focus before Chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , @@ -964,7 +964,7 @@ testcase tHHConversion_17 Call hNewDocument '/// Open a test file , which includes some Korean chacters . - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , press Ignore , @@ -1015,7 +1015,7 @@ testcase tHHConversion_18 '/// Open a test file , which includes some Chinese chacters =>. '/// + 山下 上山下乡 山下 - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , press Always Ignore , @@ -1046,7 +1046,7 @@ testcase tHHConversion_18 '/// So far , there is still a StarOffice session exists . '/// Reopen the test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , @@ -1097,7 +1097,7 @@ testcase tHHConversion_19 '/// Open a test file , which includes some Chinese chacters =>. '/// + 山下 上山下乡 山下 - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , press Always Ignore , @@ -1120,7 +1120,7 @@ testcase tHHConversion_19 Call hNewDocument '/// Reopen the test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , 山下 should be selcted @@ -1159,7 +1159,7 @@ testcase tHHConversion_20 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , select a word in selection @@ -1225,7 +1225,7 @@ testcase tHHConversion_21 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , select a word in selection, @@ -1267,7 +1267,7 @@ testcase tHHConversion_21 Call hNewDocument '/// Reopen this test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion @@ -1321,7 +1321,7 @@ testcase tHHConversion_22 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , select a word in selection, @@ -1350,7 +1350,7 @@ testcase tHHConversion_22 Call hStartTheOffice Call hNewDocument '/// Reopen this test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion @@ -1389,7 +1389,7 @@ testcase tHHConversion_23 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , select a word in selection, @@ -1454,7 +1454,7 @@ testcase tHHConversion_24 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , the default for 'Replace by character' @@ -1509,7 +1509,7 @@ testcase tHHConversion_25 '/// Open a test file , which includes some Chinese chacters =>. '/// + 山下 上山下乡 山下 - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , Check 'Replace by character' , @@ -1573,7 +1573,7 @@ testcase tHHConversion_26 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<Home>" '/// Tools / HangulHanjaConversion , Check 'Replace by character' , diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc index 0808ccacb3bb..e7b89b0accf0 100644 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc @@ -29,21 +29,6 @@ '* '* short description : Test of Hangul/Hanja Conversion - 3 '* -'************************************************************************ -'* -' #1 tHHOptions_1 'User defined dictionaries -' #1 tHHOptions_2 'Options - New 1 -' #1 tHHOptions_3 'Options - New 2 -' #1 tHHOptions_4 'Options - New 3 -' #1 tHHOptions_5 'Options - Edit (Book) -' #1 tHHOptions_6 'Options - Edit (Original) -1 -' #1 tHHOptions_7 'Options - Edit (Original) -2 -' #1 tHHOptions_8 'Options - Edit (Original) -3 -' #1 tHHOptions_9 'Options - Edit (Original) -4 -' #1 tHHOptions_10 'Options - Edit (Original) -5 -' #1 tHHOptions_11 'Options - Edit (Original) -6 -' #1 tHHOptions_12 'Options - Edit (Original) -7 -'* '\*********************************************************************** testcase tHHOptions_1 @@ -62,7 +47,7 @@ testcase tHHOptions_1 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" @@ -107,7 +92,7 @@ testcase tHHOptions_2 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -189,7 +174,7 @@ testcase tHHOptions_3 '/// Open a test file , which includes some '/// + Korean chacters and chinese characters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -254,7 +239,7 @@ warnlog( "#i111911# - Test is broken beyond repait, please rewrite" ) '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -321,7 +306,7 @@ testcase tHHOptions_5 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -396,7 +381,7 @@ testcase tHHOptions_6 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -507,7 +492,7 @@ testcase tHHOptions_7 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -615,7 +600,7 @@ testcase tHHOptions_8 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -705,7 +690,7 @@ testcase tHHOptions_9 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -791,7 +776,7 @@ testcase tHHOptions_10 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -879,7 +864,7 @@ testcase tHHOptions_11 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , @@ -962,7 +947,7 @@ testcase tHHOptions_12 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "<MOD1 Home>" '/// Tools / HangulHanjaConversion , Press Options button , diff --git a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc index 62132356360c..560265c301e8 100644 --- a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc +++ b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc @@ -51,8 +51,8 @@ testcase tHyphenation_1 printlog "Test Hyphenation using ctrl and -" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly @@ -98,8 +98,8 @@ testcase tHyphenation_2 printlog "Test Hyphenation using ctrl and -" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly @@ -153,8 +153,8 @@ testcase tHyphenation_3 printlog "Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly @@ -265,8 +265,8 @@ testcase tHyphenation_4 printlog "Test Hyphenation using Tools/Hyphenation ,test like follow-ing" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index 4b0a23775f33..4e670f290f13 100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -520,8 +520,10 @@ endcase testcase tInsertGraphic_10 Dim sTestFile as String + dim sOutFile as string sTestFile = ConvertPath(gOfficepath + "user\work\tInsertGraphic_5.sxw") + sOutFile = gOfficepath + "user\work\tInsertGraphic_5.odt" PrintLog "- Insert linked graphics and break the links via Menu Edit - Link" '/// Insert linked graphics and break the links via Menu Edit - Link @@ -636,15 +638,15 @@ testcase tInsertGraphic_10 PrintLog "- Save and Reload the file" '/// Save the file and close the file - Call hFileSaveAsWithFilterKill(gOfficepath + "user\work\tInsertGraphic_5.odt", "writer8") + Call hFileSaveAsWithFilterKill( sOutFile, "writer8") sleep(2) Call hCloseDocument sleep(2) '/// Reload the file - Call hFileOpen(gOfficepath + "user\work\tInsertGraphic_5.odt") + hFileOpen( sOutFile ) sleep(2) - Call sMakeReadOnlyDocumentEditable + '/// Check if the inserted graphics are still there Kontext "DocumentWriter" @@ -652,6 +654,10 @@ testcase tInsertGraphic_10 sleep(1) if fFormatGraphic("TabZusaetze") = false then Warnlog "#i46300#linked JPEG pictures will disappear when doc is modified." + + kontext "TabZusatze" + if ( TabZusaetze.exists() ) then TabZusaetze.close() + kontext "DocumentWriter" Call hCloseDocument goto endsub end if diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index e4871e78f400..f8dd252cd174 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -27,22 +27,16 @@ '* '* owner : helge.delfs@oracle.com '* -'* short description : Checks the export to all available Filters from +'* short description : Checks the export to all available Filters from '* -'*********************************************************************** -' -' #1 tExportAllReadableFormatsIntoODF -' #1 tExportAllReadableFormatsIntoThemselves -' #1 tExportTop5FormatsIntoTop5 -' '\*********************************************************************** testcase tExportAllReadableFormatsIntoODF - if iSprache <> 1 then - QAErrorlog "#100970#test only support english language" - goto endsub - end if + if iSprache <> 1 then + QAErrorlog "#100970#test only support english language" + goto endsub + end if Dim AvailableFilters( 35 ) as String Dim ImportFileList ( 300 ) as String @@ -65,7 +59,7 @@ testcase tExportAllReadableFormatsIntoODF for i=1 to FehlerListe(0) printlog " <> " & FehlerListe(i) next i - goto endsub + goto endsub end if end if app.Mkdir WorkDirectory @@ -74,6 +68,9 @@ testcase tExportAllReadableFormatsIntoODF GetFileList ( ImportDir, "*.*", ImportFileList() ) printlog "- Done." + ' Create local copies of all files to be imported + hFileListCopyLocal( ImportFileList() ) + printlog "- Start loading files in list" For i = 1 to listCount(ImportFileList()) printlog "- " & i & ". load: " & ImportFileList(i) @@ -85,7 +82,7 @@ testcase tExportAllReadableFormatsIntoODF elseif LCase( sExceptionFile ) = "swdos.txt" then QAErrorlog "#i114062#General I/O error loading StarWriter DOS file" else - Call hFileOpen ( ImportFileList(i) ) + Call hFileOpenLocally( ImportFileList(i) ) printlog "- done" Kontext "TextImport" @@ -186,11 +183,11 @@ endcase testcase tExportAllReadableFormatsIntoThemselves - if iSprache <> 1 then - QAErrorlog "#100970#test only support english language" - goto endsub - end if - + if iSprache <> 1 then + QAErrorlog "#100970#test only support english language" + goto endsub + end if + Dim AvailableFilters( 35 ) as String Dim SavedCorrectly as Boolean Dim ImportFileList ( 300 ) as String @@ -222,154 +219,152 @@ testcase tExportAllReadableFormatsIntoThemselves For iCurrentFileIndex = 7 to 7 select case iCurrentFileIndex - case 1 : sCurrentFile = "xml2.odt" - sCurrentFilter = "writer8" - case 2 : sCurrentFile = "wpsfile.wps" - sCurrentFilter = "Text (encoded)" - case 3 : sCurrentFile = "dostext.txt" - sCurrentFilter = "Text (encoded)" - case 4 : sCurrentFile = "sw30.sdw" - sCurrentFilter = "StarWriter 3.0" - case 5 : sCurrentFile = "sw50.vor" - sCurrentFilter = "StarWriter 5.0 Vorlage/Template" - case 6 : sCurrentFile = "sw31.sdw" - sCurrentFilter = "StarWriter 3.0" - case 7 : sCurrentFile = "sw31.vor" - sCurrentFilter = "StarWriter 3.0 Vorlage/Template" - case 8 : sCurrentFile = "sw40.sdw" - sCurrentFilter = "StarWriter 4.0" - case 9 : sCurrentFile = "sw40_sp2.vor" - sCurrentFilter = "StarWriter 4.0 Vorlage/Template" - case 10 : sCurrentFile = "sw50.sdw" - sCurrentFilter = "StarWriter 5.0" - case 11 : sCurrentFile = "html.html" - sCurrentFilter = "HTML (StarWriter)" - case 12 : sCurrentFile = "rtf.rtf" - sCurrentFilter = "Rich Text Format" - case 13 : sCurrentFile = "sw60.sxw" - sCurrentFilter = "StarOffice XML (Writer)" - case 14 : sCurrentFile = "winw97.doc" - sCurrentFilter = "MS Word 97" - case 15 : sCurrentFile = "winword6.doc" - sCurrentFilter = "MS Word 95" - case 16 : sCurrentFile = "wintext.txt" - sCurrentFilter = "Text (encoded)" -' case 17 : sCurrentFile = "pocketword.psw" -' sCurrentFilter = "PocketWord File" -' TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. -' case 18 : sCurrentFile = "unixtext.txt" -' sCurrentFilter = "Text" -' case 19 : sCurrentFile = "sw2.sdw" -' sCurrentFilter = "StarWriter 2.0" -' case 20 : sCurrentFile = "amipro3.sam" -' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" -' case 21 : sCurrentFile = "mactext.txt" -' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" -' case 22 : sCurrentFile = "sw1.sdw" -' sCurrentFilter = "StarWriter 1.0" -' case 23 : sCurrentFile = "swdoc.txt" -' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" -' case 24 : sCurrentFile = "hangul.hwp" -' sCurrentFilter = "writer_MIZI_Hwp_97" + case 1 : sCurrentFile = "xml2.odt" + sCurrentFilter = "writer8" + case 2 : sCurrentFile = "wpsfile.wps" + sCurrentFilter = "Text (encoded)" + case 3 : sCurrentFile = "dostext.txt" + sCurrentFilter = "Text (encoded)" + case 4 : sCurrentFile = "sw30.sdw" + sCurrentFilter = "StarWriter 3.0" + case 5 : sCurrentFile = "sw50.vor" + sCurrentFilter = "StarWriter 5.0 Vorlage/Template" + case 6 : sCurrentFile = "sw31.sdw" + sCurrentFilter = "StarWriter 3.0" + case 7 : sCurrentFile = "sw31.vor" + sCurrentFilter = "StarWriter 3.0 Vorlage/Template" + case 8 : sCurrentFile = "sw40.sdw" + sCurrentFilter = "StarWriter 4.0" + case 9 : sCurrentFile = "sw40_sp2.vor" + sCurrentFilter = "StarWriter 4.0 Vorlage/Template" + case 10 : sCurrentFile = "sw50.sdw" + sCurrentFilter = "StarWriter 5.0" + case 11 : sCurrentFile = "html.html" + sCurrentFilter = "HTML (StarWriter)" + case 12 : sCurrentFile = "rtf.rtf" + sCurrentFilter = "Rich Text Format" + case 13 : sCurrentFile = "sw60.sxw" + sCurrentFilter = "StarOffice XML (Writer)" + case 14 : sCurrentFile = "winw97.doc" + sCurrentFilter = "MS Word 97" + case 15 : sCurrentFile = "winword6.doc" + sCurrentFilter = "MS Word 95" + case 16 : sCurrentFile = "wintext.txt" + sCurrentFilter = "Text (encoded)" + ' case 17 : sCurrentFile = "pocketword.psw" + ' sCurrentFilter = "PocketWord File" + ' TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. + ' case 18 : sCurrentFile = "unixtext.txt" + ' sCurrentFilter = "Text" + ' case 19 : sCurrentFile = "sw2.sdw" + ' sCurrentFilter = "StarWriter 2.0" + ' case 20 : sCurrentFile = "amipro3.sam" + ' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" + ' case 21 : sCurrentFile = "mactext.txt" + ' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" + ' case 22 : sCurrentFile = "sw1.sdw" + ' sCurrentFilter = "StarWriter 1.0" + ' case 23 : sCurrentFile = "swdoc.txt" + ' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" + ' case 24 : sCurrentFile = "hangul.hwp" + ' sCurrentFilter = "writer_MIZI_Hwp_97" end select sLoadFile = sImportDir & sCurrentFile - sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex & "." & GetExtention ( sCurrentFile ) + sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex & "." & GetExtention ( sCurrentFile ) printlog "- Export of File nr " + iCurrentFileIndex + " started" printlog " - Save file: " & sLoadFile printlog " - to file: " & sSaveFile - ' Load In-file - Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." - end if - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then SecurityWarning.Ok - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop - else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false - wait 500 - Loop - else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" - end if - end if + ' Load In-file + Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then AlienWarning.Ok - - ' Save Out-file - Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." - goto Cleanup - end if - - ' Load Out-file again - Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") > 0 then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + end if + + Kontext "TextImport" + if TextImport.Exists then + TextImport.Ok + end if + + Kontext "Filterauswahl" + if Filterauswahl.Exists then + Filterauswahl.Cancel + end if + + Kontext "AsciiFilterOptionen" + if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok + Kontext "SecurityWarning" + if SecurityWarning.Exists(3) then SecurityWarning.Ok + Kontext "DocumentWriter" + if DocumentWriter.Exists(3) then + Do until DocumentWriter.StatusIsProgress = false + wait 500 + Loop + else + Kontext "DocumentCalc" + if DocumentCalc.Exists(3) then + Do until DocumentCalc.StatusIsProgress = false + wait 500 + Loop + else + Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + end if + end if + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + + Kontext "AlienWarning" + if AlienWarning.Exists then AlienWarning.Ok + + ' Save Out-file + Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) + + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." + goto Cleanup + end if + + ' Load Out-file again + Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") > 0 then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 Cleanup: kontext "active" - if active.exists(2) then + if active.exists(2) then active.ok Select Case iCurrentFileIndex - case 7: QAErrorlog "#i106758#Saving StarWriter 3 template corrupts file" - case else - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + case 7: QAErrorlog "#i106758#Saving StarWriter 3 template corrupts file" + case else + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." end select end if printlog " Close all open files." - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() printlog " - File nr " + iCurrentFileIndex + " completed." Next iCurrentFileIndex @@ -380,10 +375,10 @@ endcase testcase tExportTop5FormatsIntoTop5 - if iSprache <> 1 then - QAErrorlog "#100970#test only support english language" - goto endsub - end if + if iSprache <> 1 then + QAErrorlog "#100970#test only support english language" + goto endsub + end if Dim ExportFileList(300) as String Dim sWorkDirectory as String @@ -415,76 +410,66 @@ testcase tExportTop5FormatsIntoTop5 '// Start of the LOAD-Loop For iCurrentLoadFileIndex = 1 to 4 Select case iCurrentLoadFileIndex - case 1 : sCurrentLoadFile = sImportDir & "xml2.odt" - sCurrentLoadFilter = "writer8" - case 2 : sCurrentLoadFile = sImportDir & "sw60.sxw" - sCurrentLoadFilter = "StarOffice XML (Writer)" - case 3 : sCurrentLoadFile = sImportDir & "winw97.doc" - sCurrentLoadFilter = "MS Word 97" - case 4 : sCurrentLoadFile = sImportDir & "rtf.rtf" - sCurrentLoadFilter = "Rich Text Format" - case 5 : sCurrentLoadFile = sImportDir & "html.html" - sCurrentLoadFilter = "HTML (StarWriter)" + case 1 : sCurrentLoadFile = sImportDir & "xml2.odt" + sCurrentLoadFilter = "writer8" + case 2 : sCurrentLoadFile = sImportDir & "sw60.sxw" + sCurrentLoadFilter = "StarOffice XML (Writer)" + case 3 : sCurrentLoadFile = sImportDir & "winw97.doc" + sCurrentLoadFilter = "MS Word 97" + case 4 : sCurrentLoadFile = sImportDir & "rtf.rtf" + sCurrentLoadFilter = "Rich Text Format" + case 5 : sCurrentLoadFile = sImportDir & "html.html" + sCurrentLoadFilter = "HTML (StarWriter)" End select printlog "- Export of File nr " + iCurrentLoadFileIndex + " started." printlog " - Save file: " & sCurrentLoadFile - + '/// Here comes the SAVE-Loop For iCurrentSaveFileIndex = 1 to 5 if hFileOpenWithFilter((sCurrentLoadFile), sCurrentLoadFilter) = true then - Select case iCurrentSaveFileIndex - case 1 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" - sCurrentSaveFilter = "writer8" - case 2 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" - sCurrentSaveFilter = "StarOffice XML (Writer)" - case 3 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" - sCurrentSaveFilter = "MS Word 97" - case 4 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" - sCurrentSaveFilter = "Rich Text Format" - case 5 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" - sCurrentSaveFilter = "HTML (StarWriter)" - End select - - printlog " - " & iCurrentSaveFileIndex & ". to file: " & sCurrentSaveFile - if hFileSaveAsWithFilterKill(sCurrentSaveFile, sCurrentSaveFilter) = true then - printlog " - close all open documents" - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - printlog " - check if file exists" - if FileExists (sCurrentSaveFile) then - printlog " - success" - printlog " - reload previously saved file" - if hFileOpenWithFilter(sCurrentSaveFile, sCurrentSaveFilter) = true then - printlog " - success" - else - Warnlog "error loading file: " & sCurrentSaveFile - end if - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - else - Warnlog "Saved file doesn't exist" - 'Close the opened file - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - end if - else - Warnlog "Error saving file: " & sCurrentLoadFile - 'Close the opened file - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - end if - else - Warnlog "Error loading file: " & sCurrentLoadFile - 'Close the opened file - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - end if + Select case iCurrentSaveFileIndex + case 1 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" + sCurrentSaveFilter = "writer8" + case 2 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" + sCurrentSaveFilter = "StarOffice XML (Writer)" + case 3 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" + sCurrentSaveFilter = "MS Word 97" + case 4 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" + sCurrentSaveFilter = "Rich Text Format" + case 5 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" + sCurrentSaveFilter = "HTML (StarWriter)" + End select + + printlog " - " & iCurrentSaveFileIndex & ". to file: " & sCurrentSaveFile + if hFileSaveAsWithFilterKill(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - close all open documents" + hFileCloseAll() + printlog " - check if file exists" + if FileExists (sCurrentSaveFile) then + printlog " - success" + printlog " - reload previously saved file" + if hFileOpenWithFilter(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - success" + else + Warnlog "error loading file: " & sCurrentSaveFile + end if + hFileCloseAll() + else + Warnlog "Saved file doesn't exist" + 'Close the opened file + hFileCloseAll() + end if + else + Warnlog "Error saving file: " & sCurrentLoadFile + 'Close the opened file + hFileCloseAll() + end if + else + Warnlog "Error loading file: " & sCurrentLoadFile + 'Close the opened file + hFileCloseAll() + end if Next iCurrentSaveFileIndex printlog "- Export of File nr " + iCurrentLoadFileIndex + " completed." diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc index ec3b6cfd4627..e164bce470be 100644 --- a/testautomation/writer/optional/includes/navigator/w_navigator.inc +++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc @@ -216,8 +216,8 @@ testcase tViewNavigator3 '/// Edit / Navigator : check some Navigator-Functions /// printlog "- Edit / Navigator : check some Navigator-Functions" '/// Open document ( navigator.odt ) /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) + '/// Open Navigator /// Kontext "Navigator" if Navigator.NotExists then ViewNavigator @@ -363,8 +363,8 @@ testcase tViewNavigator4 endif printlog "- Edit / Navigator : check entry's in Navigator Index" '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\navigator.odt"' /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) + '/// Open Navigator through Edit / Navigator /// ViewNavigator Kontext "NavigatorWriter" @@ -432,8 +432,8 @@ testcase tViewNavigator5 printlog "- Edit / Navigator : Check Jumpmark from Index in Navigator" '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\navigator.odt"' /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) + '/// Open Navigator /// Kontext "NavigatorWriter" if Not NavigatorWriter.Exists then @@ -617,8 +617,8 @@ testcase tViewNavigator6 printlog "- Edit / Navigator : Rename Objects" '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" ' /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" ) + Kontext "Navigator" '/// Open Navigator /// if Navigator.NotExists then ViewNavigator @@ -674,7 +674,7 @@ testcase tViewNavigator6 Sleep 2 printlog "- Saving and Loading the document, check settings" - Call hFileOpen(gOfficePath + "user\work\uvobj.odt") + hFileOpen( gOfficePath & "user\work\uvobj.odt") '/// Navigator has to be opened with document /// Kontext "Navigator" if Navigator.NotExists then diff --git a/testautomation/writer/optional/includes/number/w_205_.inc b/testautomation/writer/optional/includes/number/w_205_.inc index 57a56ab80b8c..ade7afe66ad2 100644 --- a/testautomation/writer/optional/includes/number/w_205_.inc +++ b/testautomation/writer/optional/includes/number/w_205_.inc @@ -183,7 +183,7 @@ testcase tFormatNumberingBullets Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\format4." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\format4." & WriterFilterExtension(0) ) Sleep 2 '/// Close document /// Call hCloseDocument @@ -315,7 +315,7 @@ testcase tFormatNumberingPosition Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\tFormatNumberingPosition." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\tFormatNumberingPosition." & WriterFilterExtension(0) ) '/// check settings on Format / NumberingBullets /// FormatNumberingBullets @@ -499,7 +499,7 @@ testcase tFormatNumberingOptions Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\format6." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\format6." & WriterFilterExtension(0) ) For i = 1 to 15 call wTypeKeys "<Up>" Wait 500 @@ -713,7 +713,7 @@ testcase tFormatNumberingAll Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\format7." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\format7." & WriterFilterExtension(0) ) Sleep 2 FormatNumberingBullets '/// reopen Format / NumberingBullets and check saved settings /// diff --git a/testautomation/writer/optional/includes/number/w_205a_.inc b/testautomation/writer/optional/includes/number/w_205a_.inc index 0e157368d433..385d2a5501f4 100644 --- a/testautomation/writer/optional/includes/number/w_205a_.inc +++ b/testautomation/writer/optional/includes/number/w_205a_.inc @@ -47,8 +47,8 @@ testcase tToolsOutlineNumbering1 Dim i as integer PrintLog "- Tools / Outline Numbering: Part 1 - Numbering" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) + ToolsOutlineNumbering Kontext @@ -240,10 +240,10 @@ testcase tToolsOutlineNumbering1 Select Case i Case 1 printlog "- Load sxw and check formattings" - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering1.sxw" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering1.sxw" ) Case 2 printlog "- Load odt and check formattings" - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering1.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering1.odt" ) end select call wTypeKeys "<PageUp>", 8 call wTypeKeys "<Up>", 10 @@ -343,8 +343,8 @@ testcase tToolsOutlineNumbering2 PrintLog "- Tools / Outline Numbering: Part 2 - Tabpage Position" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) + ToolsOutlineNumbering Kontext @@ -463,7 +463,7 @@ testcase tToolsOutlineNumbering2 printlog " - check saved Numbering" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsOutlineNumbering2.odt", "writer8" ) Call hCloseDocument - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering2.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering2.odt" ) ToolsOutlineNumbering Kontext @@ -638,7 +638,7 @@ testcase tToolsOutlineNumbering3 printlog " - check saved Numbering" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsOutlineNumbering3.odt", "writer8" ) Call hCloseDocument - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering3.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering3.odt" ) ToolsOutlineNumbering Kontext Active.SetPage TabKapitelnumerierung @@ -840,7 +840,7 @@ testcase tToolsFootnoteEndnote printlog " - Save and reload" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsFootnoteEndnote.odt", "writer8" ) Call hCloseDocument - Call hFileOpen ( gOfficePath + "user\work\tToolsFootnoteEndnote.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsFootnoteEndnote.odt" ) printlog " - check saved properties" ToolsFootnote Kontext diff --git a/testautomation/writer/optional/includes/number/w_206_.inc b/testautomation/writer/optional/includes/number/w_206_.inc index ae7698017216..92958c2d9b18 100644 --- a/testautomation/writer/optional/includes/number/w_206_.inc +++ b/testautomation/writer/optional/includes/number/w_206_.inc @@ -340,7 +340,7 @@ testcase tToolsNumbering6 Call hFileSaveAsKill ( gOfficepath & "user\work\tToolsNumbering6.odt" ) '/// Close and reload document Call hCloseDocument - Call hFileOpen ( gOfficepath & "user\work\tToolsNumbering6.odt" ) + hFileOpen( gOfficepath & "user\work\tToolsNumbering6.odt" ) end if call wTypeKeys ( "<MOD1 A>" ) EditCopy @@ -448,7 +448,7 @@ testcase tToolsNumbering7 Call hFileSaveAsKill ( gOfficepath & "user\work\tToolsNumbering7.odt" ) '/// Close and reload document Call hCloseDocument - Call hFileOpen ( gOfficepath & "user\work\tToolsNumbering7.odt" ) + hFileOpen( gOfficepath & "user\work\tToolsNumbering7.odt" ) end if call wTypeKeys ( "<MOD1 A>" ) diff --git a/testautomation/writer/optional/includes/number/w_207_.inc b/testautomation/writer/optional/includes/number/w_207_.inc index 634e7c5773a7..4bc525553f56 100644 --- a/testautomation/writer/optional/includes/number/w_207_.inc +++ b/testautomation/writer/optional/includes/number/w_207_.inc @@ -74,10 +74,10 @@ testcase tToolsNumbering12 end select printlog( "Open file: " & DocFileList( iCurrentDocument ) ) - Call hFileOpen ( DocFileList( iCurrentDocument ) ) + hFileOpenLocally( DocFileList( iCurrentDocument ) ) printlog( "Make a copy if the file is write protected" ) - Call sMakeReadOnlyDocumentEditable + printlog( "Test for unexpected dialog: Filter Selection" ) Kontext "Filterauswahl" @@ -111,7 +111,7 @@ testcase tToolsNumbering12 Call hCloseDocument printlog " - load previous saved document" - Call hFileOpen ( ExportFileName ) + hFileOpen( ExportFileName ) printlog " - close document" hFileCloseAll() @@ -132,8 +132,8 @@ testcase tToolsNumbering13 '/// This testcase loads a Worddocument that lost all formattings printlog "#i73790 regression testing" '/// Load document 'writer\\optional\\input\\number\\regression\\73790.doc' - Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\regression\73790.doc" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\number\regression\73790.doc" ) + '/// Document has Heading1-Heading3 formatted, be sure it is call wTypeKeys ("<Mod1 Home>") '/// Point cursor to top of document with <STRG HOME> diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc index cbc35f599a4b..4eb667c7dc19 100644 --- a/testautomation/writer/optional/includes/option/wh_o_1.inc +++ b/testautomation/writer/optional/includes/option/wh_o_1.inc @@ -148,8 +148,8 @@ testcase tToolsOptionsHTMLLayout Dim iMasseinheit(3) as integer Dim iTemp(3) as integer '///Open "writer\\optional\\input\\options\\options1.sxw /// - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + printlog "'///- Tools/Options/Writer: View ///" ToolsOptions @@ -397,8 +397,8 @@ testcase tToolsOptionsHTMLGrid Dim sTempMetricField(4) as string '/// uses: "writer\\optional\\input\\options\\options1.sxw" /// - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + printlog "'///- Tools/Options/HTML: Grid ///" printlog ("'/// - save states ///") @@ -552,8 +552,8 @@ testcase tToolsOptionsHTMLGrid '/// ( gTesttoolPath + "writer\optional\input\options\gridtst.sxw" ) ///' '/// NOT Possible Without <ALT> + <cursor> stuff :-((((( BugID: 84741 ///' '/// uses"writer\optional\input\options\htmltag.html" /// - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\htmltag.html" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\htmltag.html" ) + '/// check if writeable!///' try diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index bdee49ed7460..ff58ce4e4f09 100644 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -48,8 +48,8 @@ testcase tToolsOptionsHTMLPrint dim bRadioBut(4) as boolean ' RadioButtons dim bTempRadioBut(4) as boolean - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\test.html" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\test.html" ) + printlog "- Tools/Options/HTML: PrintHTML " printlog (" - save states ") @@ -83,7 +83,13 @@ testcase tToolsOptionsHTMLPrint if bCheckboxStatus(6) 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 + end if + end if bTempRadioBut(1) = Keine.IsChecked bTempRadioBut(2) = NurNotizen.IsChecked @@ -163,7 +169,7 @@ testcase tToolsOptionsHTMLPrint ' Is saved with document Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Call hFileOpen(gOfficepath + "user\work\printtest.html") + hFileOpen( gOfficePath & "user\work\printtest.html") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) @@ -185,7 +191,13 @@ testcase tToolsOptionsHTMLPrint 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 + end if + end if bTempRadioBut(1) = Keine.IsChecked bTempRadioBut(2) = NurNotizen.IsChecked diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc index 26edd589af84..6ca437431ec4 100644 --- a/testautomation/writer/optional/includes/option/wr_o_1.inc +++ b/testautomation/writer/optional/includes/option/wr_o_1.inc @@ -426,8 +426,8 @@ testcase tToolsOptionsWriterView5 Call hNewDocument '/// open document: writer\\optional\\input\\options\\options1.sxw - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + '///- Tools/Options/Writer: View printlog ("'/// - save states ///") @@ -481,8 +481,8 @@ testcase tToolsOptionsWriterView6 Call hNewDocument '/// open document: writer\\optional\\input\\options\\options1.sxw - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + '///- Tools/Options/Writer: View printlog ("'/// - save states ///") @@ -542,8 +542,8 @@ testcase tToolsOptionsWriterView7 Call hNewDocument '/// open document: writer\\optional\\input\\options\\options1.sxw - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + '///- Tools/Options/Writer: View printlog ("'/// - save states ///") @@ -867,8 +867,8 @@ testcase tToolsOptionsWriterGrid4 printlog ("'/// Function Test: Grid Resolution ///'") '/// ( gTesttoolPath + "writer\optional\input\options\gridtst.sxw" ) ///' - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\gridtst.sxw", False ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\gridtst.sxw", False ) + ' select grafik element Call wNavigatorAuswahl(4,1) 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 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 diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc index 39fd97994e1a..0a047499d9f8 100644 --- a/testautomation/writer/optional/includes/option/wr_o_3.inc +++ b/testautomation/writer/optional/includes/option/wr_o_3.inc @@ -938,7 +938,7 @@ testcase tToolsOptionsWriterCompatibility1 printlog "- load previously saved document" Call hNewDocument - Call hFileOpen (gOfficePath + "user\work\tToolsOptionsWriterCompatibility1.odt") + hFileOpen( gOfficePath & "user\work\tToolsOptionsWriterCompatibility1.odt") Printlog "check state of all checkboxes and uncheck all checkboxes" ToolsOptions @@ -1010,8 +1010,8 @@ testcase tToolsOptionsWriterCompatibility2 Call hNewDocument printlog "open document ./writer/leve11/input/options/compatibility1.doc" printlog "check formatting of current opened document" - Call hFileOpen ( gTesttoolpath & "writer\optional\input\options\compatibility1.doc" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\options\compatibility1.doc" ) + Call wTypeKeys ("<Mod1 Home>") Call wTypeKeys ("<Down>") @@ -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" - Call hFileOpen (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 83f09e5c7e89..d5516718ee66 100644 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -217,7 +217,7 @@ testcase tToolsOptionsWriterOther ' load file in this environment '///use "output\\writer\\w95\\tab25cm.odt" /// - Call hFileOpen (gOfficePath + "user\work\tab25cm.odt") + hFileOpen( gOfficePath & "user\work\tab25cm.odt") sleep (2) ' check TabStops, have to be the ones this file was saved with ToolsOptions @@ -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" diff --git a/testautomation/writer/optional/includes/option/wr_o_a.inc b/testautomation/writer/optional/includes/option/wr_o_a.inc index ac6084157867..64f60fa7e0f9 100644 --- a/testautomation/writer/optional/includes/option/wr_o_a.inc +++ b/testautomation/writer/optional/includes/option/wr_o_a.inc @@ -45,8 +45,8 @@ testcase tToolsOptionsWriterPrint Dim i as integer printlog "- Tools/Options/Writer: PrintWriter (real print)" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options3.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options3.sxw" ) + Printlog " - check all (real print)" ToolsOptions diff --git a/testautomation/writer/optional/includes/redlining/w_redlining1.inc b/testautomation/writer/optional/includes/redlining/w_redlining1.inc index d6983e200a4c..b08faaf6d8d8 100644 --- a/testautomation/writer/optional/includes/redlining/w_redlining1.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining1.inc @@ -1104,8 +1104,8 @@ testcase tRedlining_16 '/// + Redlining test => OK_2 <-- Numbering style : list 2 '/// + Redlining test => OK_3 <-- Numbering style : list 3 - Call hFileOpen ( gTesttoolPath + "writer\optional\input\redlining\tRedlining_15.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\redlining\tRedlining_15.sxw" ) + Call wTypeKeys "<Up>" , 3 diff --git a/testautomation/writer/optional/includes/regexp/regular.inc b/testautomation/writer/optional/includes/regexp/regular.inc index 3a323bce2a49..d53277085b13 100644 --- a/testautomation/writer/optional/includes/regexp/regular.inc +++ b/testautomation/writer/optional/includes/regexp/regular.inc @@ -899,8 +899,8 @@ sub Ausgangszustand_herstellen '///+ Uncheck 'Search for Styles' /// '///+ Uncheck 'Similarity Search' /// '///+ Check 'Regular Expressions' /// - Call hFileOpen ( gtesttoolpath + "writer\optional\input\search\regu_aus.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath + "writer\optional\input\search\regu_aus.sxw") + kontext if FindAndReplace.Exists then FindAndReplace.Close kontext "DocumentWriter" diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc index 8121859870ad..e5fe3b4f267f 100644 --- a/testautomation/writer/optional/includes/regexp/search.inc +++ b/testautomation/writer/optional/includes/regexp/search.inc @@ -64,10 +64,8 @@ end sub '--------------------------------------------------------- testcase tCheckDialog - warnlog( "#i111908# - Control <Replace> cannot be accessed" ) - goto endsub - Dim Checkboxtitel + Dim Checkboxtitel Call hNewDocument EditSearchAndReplace Sleep 2 @@ -1524,11 +1522,11 @@ sub wSetFindAndReplaceToDefault(WhichDocument as integer) Case 0 Call hNewDocument ' empty Document Case 1 - Call hFileOpen ( gTesttoolPath +"writer\optional\input\search\such_u_e.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath +"writer\optional\input\search\such_u_e.sxw") + case 2 - Call hFileOpen ( gTesttoolPath +"writer\optional\input\search\attrib.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath +"writer\optional\input\search\attrib.sxw") + end select kontext "FindAndReplace" Sleep 2 diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index 5e13f9353891..dd3b304ad151 100644 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -153,8 +153,8 @@ testcase i65094 Call hNewDocument '/// Open file \\writer\\optional\\input\\regression\\issuezilla\\i65094a.odt printlog "- Open file: i65094a.odt" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i65094a.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\regression\issuezilla\i65094a.odt" ) + '/// Compare document with other version \\writer\\optional\\input\\regression\\issuezilla\\i65094b.odt ' UseBindings printlog "- Compare document with other version" @@ -165,7 +165,7 @@ testcase i65094 ' Sleep 2 Oeffnen.Click Sleep 5 - Call sMakeReadOnlyDocumentEditable + printlog "- Accept all" '/// In Redlining dialog select 'Accept all' Kontext "Redlining" @@ -205,7 +205,7 @@ testcase i69045 Call hCloseDocument printlog "- Save, close and load document" '/// Open saved document - Call hFileOpen ( gOfficepath & "user\work\i69045.odt" ) + hFileOpen( gOfficepath & "user\work\i69045.odt" ) '/// Check try EditChangesAcceptOrReject @@ -236,8 +236,8 @@ testcase i69521 '/// New writer document Call hNewDocument '/// Load document: \\writer\\optional\\input\\regression\\issuezilla\\i69521.odt - Call hFileOpen (gTesttoolpath & "writer\optional\input\regression\issuezilla\i69521.odt") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\regression\issuezilla\i69521.odt") + '/// Loaded document should have 5 EPS Graphics iItems = CountItemsInNavigatorGroup(4) if iItems <> 5 then @@ -251,7 +251,7 @@ testcase i69521 '/// close document Call hCloseDocument '/// reload previous saved document - Call hFileOpen (gOfficePath & "user\work\i96521-1.odt") + hFileOpen( gOfficePath & "user\work\i96521-1.odt") '/// Check if all 5 Graphics are still in document iItems = CountItemsInNavigatorGroup(4) if iItems <> 5 then @@ -325,7 +325,7 @@ testcase i75027 Call hFileSaveAsKill (gOfficepath & "user\work\i75027.html") '/// Reload previous saved document Call hCloseDocument - Call hFileOpen (gOfficepath & "user\work\i75027.html") + hFileOpen( gOfficepath & "user\work\i75027.html") '/// Check that the numbering is still the same. printlog "- check numbering (previous saved)" Call wTypeKeys ( "<MOD1 A>" ) @@ -444,8 +444,8 @@ testcase i103265 printlog "ODF Hyperlinks in TOCs" Call hNewDocument printlog "- Open test document" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" ) + printlog "- Update TOC" ToolsUpdateAllIndexes @@ -482,7 +482,7 @@ testcase i103265 Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html" ) + hFileOpen( gOfficePath & "user\work\ODFHyperlinksInTOCs.html" ) printlog "Check that every hyperlink jumps correctly to its target" For i = 1 to 3 ' point cursor to beginning of document diff --git a/testautomation/writer/optional/includes/section/w_section_3.inc b/testautomation/writer/optional/includes/section/w_section_3.inc index 6dc00cd5c0f3..e23b4c8502d5 100644 --- a/testautomation/writer/optional/includes/section/w_section_3.inc +++ b/testautomation/writer/optional/includes/section/w_section_3.inc @@ -1064,7 +1064,7 @@ testcase tPasswordProtectSection_2 Call hCloseDocument PrintLog " Reload the file" - Call hFileOpen (gOfficePath + "user\work\tPasswordProtectSection_2.odt") + hFileOpen( gOfficepath + "user\work\tPasswordProtectSection_2.odt") FormatSections Kontext "BereicheBearbeiten" @@ -1200,7 +1200,7 @@ testcase tPasswordProtectSection_4 Call hCloseDocument PrintLog " Reload the file" - Call hFileOpen (gOfficePath + "user\work\tPasswordProtectSection_4.odt") + hFileOpen( gOfficepath + "user\work\tPasswordProtectSection_4.odt") PrintLog " In format/section, PW-Dialogue should appear when clicking 'option' button" FormatSections 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 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 diff --git a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc index 0bd84118edc5..22d64c36ed43 100644 --- a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc +++ b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc @@ -779,6 +779,7 @@ testcase tShortcutPasteUnformattedText Kontext Active.Setpage TabFont Kontext "TabFont" + wait 500 DefaultSize = Size.GetSelIndex Size.Select 14 ' Size 20 DefaultStyle = Style.GetSelIndex @@ -824,6 +825,7 @@ testcase tShortcutPasteUnformattedText Kontext Active.Setpage TabFont Kontext "TabFont" + wait 500 if Size.GetSelIndex <> 14 then Warnlog "formatted word has lost its size" endif @@ -842,6 +844,7 @@ testcase tShortcutPasteUnformattedText Kontext Active.Setpage TabFont Kontext "TabFont" + wait 500 if Size.GetSelIndex <> DefaultSize then Warnlog "formatted word has no default size" endif diff --git a/testautomation/writer/optional/includes/sorting/w_sorting1.inc b/testautomation/writer/optional/includes/sorting/w_sorting1.inc index d4cb27449cba..70fcbab3f26f 100644 --- a/testautomation/writer/optional/includes/sorting/w_sorting1.inc +++ b/testautomation/writer/optional/includes/sorting/w_sorting1.inc @@ -28,15 +28,6 @@ '* '* short description : Sorting functions in Writer '* -'************************************************************************ -'* -' #1 tToolsSort1 ' Text in one Column and 1 Key -' #1 tToolsSort2 ' Numbers in 1 Column and 1 Key -' #1 tToolsSort3 ' Text in several Columns and 3 Keys -' #1 tToolsSort4 ' Table with Header ( Text and Numbers mixed ) -' #1 tToolsSort5 ' Table without Header ( Text and Numbers mixed ) -' #1 tToolsSort6 ' Copy sorted table in another table -'* '\*********************************************************************** sub w_sorting @@ -236,18 +227,16 @@ testcase tToolsSort3 PrintLog "- Tools / Sorting text in several lines" for i=1 to 3 select case i - case 1: Printlog " - Seperator is a tabulator" - case 2: Printlog " - Seperator is a semicolon" + case 1: Printlog " - Separator is a tabulator" + case 2: Printlog " - Separator is a semicolon" Trennzeichen = ";" - case 3: Printlog " - Seperator is a '|'" + case 3: Printlog " - Separator is a '|'" Trennzeichen = "|" end select if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort2.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort2.odt" ) else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort2.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort2.odm" ) end if if i <> 1 then TrennzeichenSetzen ( Trennzeichen ) @@ -319,11 +308,9 @@ endcase testcase tToolsSort4 PrintLog "- Tools / Sorting in table with header" if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) end if Call wTypeKeys "<Mod1 a>", 2 @@ -444,11 +431,9 @@ endcase testcase tToolsSort5 PrintLog "- Tools / Sorting in table without header" if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) end if Call wNavigatorAuswahl (2, 2) @@ -574,11 +559,9 @@ testcase tToolsSort6 PrintLog "- Tools / Sort a sorted table and copy in another one" if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort3.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort3.odt" ) else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort3.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort3.odm" ) end if Call wTypeKeys "<Mod1 a>", 2 diff --git a/testautomation/writer/optional/includes/sorting/w_sorting2.inc b/testautomation/writer/optional/includes/sorting/w_sorting2.inc index d5d3b49ea61f..c716b597126b 100644 --- a/testautomation/writer/optional/includes/sorting/w_sorting2.inc +++ b/testautomation/writer/optional/includes/sorting/w_sorting2.inc @@ -93,8 +93,8 @@ testcase tSort_1 printlog " open a test file" - Call hFileOpen ( TestFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( TestFile ) + printlog " select all table" Call wTypeKeys "<Mod1 a>", 2 @@ -187,8 +187,8 @@ testcase tSort_2 end select printlog " open a test file" - Call hFileOpen ( TestFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( TestFile ) + printlog " select all table" Call wTypeKeys "<Mod1 a>", 2 diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index 886f7fa91967..a6dd6c18b997 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -58,8 +58,8 @@ testcase tToolsSpellcheckWithShortcut exit sub end if - call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally (TheFile,false) + printlog " Insert some faulty text" select case iSprache @@ -149,8 +149,8 @@ testcase tToolsSpellcheckCorrect PrintLog "- Tools / Spellcheck without text" printlog " Open document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally (TheFile,false) + printlog " Insert some faulty text" Sleep 1 @@ -284,8 +284,8 @@ testcase tToolsSpellcheck1Mistake end select printlog " Open document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally (TheFile,false) + '/// Insert a sentence with one definded mistake and execute spellcheck /// Call wTypeKeys sErrorSampleText @@ -387,8 +387,8 @@ testcase tToolsSpellcheckForward if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if '/// point cursor to beginning of document and execute spellcheck /// Call wTypeKeys "<Mod1 Home>" @@ -561,8 +561,8 @@ testcase tToolsSpellcheckOnlyOneWord if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "<Mod1 Home>" @@ -741,8 +741,8 @@ testcase tToolsSpellcheckAutomatic PrintLog "- Tools / Spellcheck / AutoSpellcheck" printlog " Open document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally (TheFile,false) + '/// Enable Auto-Spellcheck in options Call wEnableAutoSpellcheck ( true ) @@ -937,8 +937,8 @@ testcase tToolsSpellcheckChangeLanguageAttribute if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "<Mod1 Home>" @@ -1135,8 +1135,8 @@ testcase tToolsSpellcheckButtonChange if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "<Mod1 Home>" @@ -1202,8 +1202,8 @@ testcase tToolsSpellcheckButtonChangeAll if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "<Mod1 Home>" @@ -1288,8 +1288,8 @@ testcase tToolsThesaurus end select printlog "Open new preformatted-writerdocument" - call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally (TheFile,false) + printlog "- Thesaurus without a word" '/// Call Thesaurus without a written word /// @@ -1322,8 +1322,8 @@ testcase tToolsThesaurus wait 500 printlog " Open new preformatted-document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally (TheFile,false) + Call wTypeKeys sWordInitial Call wTypeKeys "<Home><Right><Right>" @@ -1444,8 +1444,8 @@ testcase tToolsThesaurusSynonyms end select printlog "Open new preformatted-writerdocument" - call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally (TheFile,false) + Call wTypeKeys sWordInitial Call wTypeKeys "<Shift Home>" diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc index 069b133700bd..d2df892a3bc5 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc @@ -50,7 +50,7 @@ DIM WordLanguageTemp AS string 'variable for checking if Office language is a '///Load test document/// call hFileOpen (ConvertPath ( gTesttoolPath + "writer\optional\input\spellcheck\Language_Guessing_Sample_Texts.odt")) 'loading Test-Doc - Call sMakeReadOnlyDocumentEditable + sleep(5) '---------------------------------------------------------------- '///Enable auto spellcheck/// diff --git a/testautomation/writer/optional/includes/textframes/w_textframes1.inc b/testautomation/writer/optional/includes/textframes/w_textframes1.inc index 17eeff80ad95..ed3ee9b2dd5e 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes1.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes1.inc @@ -408,8 +408,8 @@ testcase tTextframes_6 '/// + This test file is designed for Anchor To Page test. '/// + There are 2 pages in the file , and the frame is in '/// + the bottom of first page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Check1: EditSearchAndReplace @@ -506,8 +506,8 @@ testcase tTextframes_7 '/// + There are 2 paragraphs in the file , and the head of 2nd '/// + paragraph is in the bottom of the first page . '/// + The frame is in the first line of 2nd paragraph - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// check if the frame is in the first page Call wTypeKeys ( "<Shift F4>" ) @@ -586,8 +586,8 @@ testcase tTextframes_8 '/// + The frame is anchored to the character 't' of That . '/// + The frame is in the bottom of the first page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// check if the frame is in the first page Call wTypeKeys ( "<Shift F4>" ) @@ -643,8 +643,8 @@ testcase tTextframes_8 Call hCloseDocument - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call wTypeKeys ( "<Shift F4>" ) Sleep 1 @@ -718,8 +718,8 @@ testcase tTextframes_9 '/// + This test file is designed for Anchor as Character test. '/// + The frame is anchored as the character. '/// + The frame is in the right and bottom of the first page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'check if the frame is in the first page Call wTypeKeys ( "<Shift F4>" ) @@ -775,8 +775,8 @@ testcase tTextframes_9 Call hCloseDocument - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Check2: Kontext @@ -852,8 +852,8 @@ testcase tTextframes_10 '/// Open a test file '/// + This test file is designed for Anchor in gathering pages&columns test. '/// + There are 2 columns in the page. And the frame is in the second column. - Call hFileOpen(sTestFile1,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile1,false) + 'Press return to ensure the frame is in 2nd column Call wTypeKeys "<MOD1 Home>" @@ -888,8 +888,8 @@ testcase tTextframes_10 '/// + This test file is designed for Anchor in seperating '/// + pages&columns test. '/// + There are 2 pages. And the frame is in the second page. - Call hFileOpen(sTestFile2,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile2,false) + 'check if the frame is in the 2nd page Call wTypeKeys ( "<Shift F4>" ) @@ -957,8 +957,8 @@ testcase tTextframes_11 '/// + There are 2 paragraph in the file . '/// + The 1st paragraph is in 1st page and the 2nd paragraph is in 2nd page '/// + Two paragraphs, a frame is anchored to the second one. When deleting the paragraph mark, the anchor of the frame has to move the the first paragraph. - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Check1: 'First check diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc index a316cd19b49c..4fca2bdbddb6 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc @@ -212,8 +212,8 @@ testcase tTextframes_20 '/// + There are 1 page in the file. '/// + The frame is ocupied in the whole 1st page and wraped as Through '/// + Some text are behind the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "<Shift F4>" ) @@ -282,8 +282,8 @@ testcase tTextframes_21 '/// + The frame is ocupied in the whole 1st page and wraped as None '/// + Some text are in the 2nd page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "<Shift F4>" ) @@ -353,8 +353,8 @@ testcase tTextframes_22 '/// + there are some space in the left of the frame. '/// + Some text are in the 2nd page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + printlog "- Test wrap - before" @@ -472,8 +472,8 @@ testcase tTextframes_23 '/// + there are some space in the right of the frame. '/// + Some text are in the 2nd page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + printlog "- Test wrap - before" @@ -1075,7 +1075,7 @@ testcase tTextframes_31 Sleep 2 '/// Check if the frame is non-editable - Call hFileOpen(sTestFile,false) + hFileOpen( sTestFile ) Call wTypeKeys ( "<Shift F4>" ) @@ -1132,7 +1132,7 @@ testcase tTextframes_32 Sleep 2 '/// Check if the text can be inputed into frame - Call hFileOpen(sTestFile,false) + hFileOpen( sTestFile ) Call wTypeKeys "<SHIFT F4><RETURN>" Wait 500 diff --git a/testautomation/writer/optional/includes/textframes/w_textframes3.inc b/testautomation/writer/optional/includes/textframes/w_textframes3.inc index 28e6f9b7f404..d9db6fa32253 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes3.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes3.inc @@ -273,8 +273,8 @@ testcase tTextframes_36 '/// + This test file is designed for testing link '/// + frames which are placed on different pages '/// + There are 2 pages in the file and 1 frame/page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to first frame Call wTypeKeys ( "<Shift F4>" ) @@ -364,8 +364,8 @@ testcase tTextframes_37 '/// + frames which are placed on header '/// + There are 2 frames in the header - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to first frame Call wTypeKeys ( "<Shift F4>" ) @@ -427,8 +427,8 @@ testcase tTextframes_38 '/// + This test file is designed for testing link '/// + frames which are placed on header '/// + There are 2 frames in the header - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to first frame Call wTypeKeys ( "<Shift F4>" ) diff --git a/testautomation/writer/optional/includes/textframes/w_textframes4.inc b/testautomation/writer/optional/includes/textframes/w_textframes4.inc index 43af4c5bd532..6da21bcd513f 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes4.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes4.inc @@ -95,8 +95,8 @@ testcase tTextframes_50 '/// Open a test file , which includes a frame and '/// + it is StarOffice 7 format - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "<Shift F4>" ) @@ -132,8 +132,8 @@ testcase tTextframes_51 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'in front of text' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "<Shift F4>" ) @@ -169,8 +169,8 @@ testcase tTextframes_52 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'behind text' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to the frame Call wTypeKeys ( "<Shift F4>" ) @@ -206,8 +206,8 @@ testcase tTextframes_53 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'tight' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to the frame Call wTypeKeys ( "<Shift F4>" ) @@ -222,9 +222,7 @@ testcase tTextframes_53 TabType.Cancel printlog " Close active document " - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() endcase @@ -243,8 +241,8 @@ testcase tTextframes_54 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'square' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to the frame Call wTypeKeys ( "<Shift F4>" ) @@ -376,8 +374,8 @@ testcase tTextframes_57 '/// Open a test file , which includes a frame in header and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -455,8 +453,8 @@ testcase tTextframes_58 '/// Open a test file , which includes a frame in header and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -529,8 +527,8 @@ testcase tTextframes_59 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -615,8 +613,8 @@ testcase tTextframes_60 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the frame Call wTypeKeys ( "<Shift F4>" ) @@ -711,8 +709,8 @@ testcase tTextframes_61 '/// Open a test file , which includes a frame in footer and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -789,8 +787,8 @@ testcase tTextframes_62 '/// Open a test file , which includes a frame in footer and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -867,8 +865,8 @@ testcase tTextframes_63 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -957,8 +955,8 @@ testcase tTextframes_64 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -1048,8 +1046,8 @@ testcase tTextframes_65 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -1127,8 +1125,8 @@ testcase tTextframes_66 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -1205,8 +1203,8 @@ testcase tTextframes_67 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -1295,8 +1293,8 @@ testcase tTextframes_68 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -1386,8 +1384,8 @@ testcase tTextframes_69 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) @@ -1465,8 +1463,8 @@ testcase tTextframes_70 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "<Shift F4>" ) diff --git a/testautomation/writer/optional/includes/textframes/w_textframes5.inc b/testautomation/writer/optional/includes/textframes/w_textframes5.inc index f9a9944b4333..7bcba8594a9c 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes5.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes5.inc @@ -115,8 +115,7 @@ testcase tTextframes_72 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B - Call hFileOpen(( Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw") ),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw" ) 'Set focus to Frame B Call wTypeKeys ( "<Shift F4>" ) @@ -152,8 +151,7 @@ testcase tTextframes_73 Call hNewDocument '/// Open a test file , which includes 1 frame in the document body - Call hFileOpen((Convertpath (gTesttoolpath + "writer\optional\input\textframe\frame.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\textframe\frame.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -188,8 +186,7 @@ testcase tTextframes_74 Call hNewDocument '/// Open a test file , which includes 1 frame in the document body - Call hFileOpen((Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -223,8 +220,7 @@ testcase tTextframes_75 Call hNewDocument '/// Open a test file , which includes 1 frame in the header - Call hFileOpen((Convertpath (gTesttoolpath + "writer\optional\input\textframe\Header.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\Header.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -259,8 +255,7 @@ testcase tTextframes_76 Call hNewDocument '/// Open a test file , which includes 1 frame in the footer - Call hFileOpen((gTesttoolpath + "writer\optional\input\textframe\Footer.sxw"),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\Footer.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -295,8 +290,7 @@ testcase tTextframes_77 Call hNewDocument '/// Open a test file , which includes 1 frame in the footnote - Call hFileOpen((Convertpath(gTesttoolpath + "writer\optional\input\textframe\frameInFootnote.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpen( gTesttoolpath & "writer\optional\input\textframe\frameInFootnote.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -331,8 +325,7 @@ testcase tTextframes_78 Call hNewDocument '/// Open a test file , which includes 1 frame in the endnote - Call hFileOpen((Convertpath(gTesttoolpath + "writer\optional\input\textframe\frameInEndnote.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\textframe\frameInEndnote.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -379,8 +372,7 @@ testcase tTextframes_80 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -435,8 +427,7 @@ testcase tTextframes_81 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -491,8 +482,7 @@ testcase tTextframes_82 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -549,8 +539,7 @@ testcase tTextframes_83 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -615,8 +604,7 @@ testcase tTextframes_84 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "<Shift F4>" ) @@ -683,9 +671,7 @@ testcase tTextframes_85 '/// + One is top to the line text , '/// + another one is center to the line text , '/// + the 3rd one is bottom to the line text - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable - Sleep (2) + hFileOpenLocally( sTestFile ) '/// Set focus to 1st Frame Call wTypeKeys ( "<Shift F4>" ) diff --git a/testautomation/writer/optional/includes/tools/tools1.inc b/testautomation/writer/optional/includes/tools/tools1.inc index f5d8362b2a84..a2a1e04dc0ad 100755 --- a/testautomation/writer/optional/includes/tools/tools1.inc +++ b/testautomation/writer/optional/includes/tools/tools1.inc @@ -66,8 +66,8 @@ end function function fFormatGraphic(Options as string) as boolean Dim j as integer, sSlotOK as boolean + fFormatGraphic = true if ( hUseAsyncSlot( "FormatGraphics" ) <> -1 ) then - Kontext if ( Active.exists( 2 ) ) then Select case Options @@ -99,9 +99,11 @@ function fFormatGraphic(Options as string) as boolean end select else warnlog( "Failed to access <Format Graphics> Tabpage" ) + fFormatGraphic = false endif else warnlog( "Failed to execute <FormatGraphics>" ) + fFormatGraphic = false endif Kontext Options diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_4.inc b/testautomation/writer/optional/includes/undo/w_undo_history_4.inc index e1370f29e541..568d6cd3d295 100755 --- a/testautomation/writer/optional/includes/undo/w_undo_history_4.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_4.inc @@ -290,8 +290,8 @@ testcase tUndoSpellcheck '/// <B>Spellcheck(Autocheck/Spellcheck)</B> printlog "- Spellcheck: Autocheck" '/// new document /// - hfileOpen (gTesttoolpath + "writer\optional\input\undo\spellcheck_undo.odt") - Call sMakeReadOnlyDocumentEditable + Call hfileOpenLocally (gTesttoolpath + "writer\optional\input\undo\spellcheck_undo.odt") + '/// Type "This is a testp<End>" Call wTypeKeys ( "<End>" ) 'This is a testp '/// Select word' testp' diff --git a/testautomation/writer/optional/w_clipbrd.bas b/testautomation/writer/optional/w_clipbrd.bas index 5fa732706afc..97d209d7599e 100755 --- a/testautomation/writer/optional/w_clipbrd.bas +++ b/testautomation/writer/optional/w_clipbrd.bas @@ -35,22 +35,34 @@ Global CharsetSet as integer Global ExportSet as integer sub main - use "writer\tools\includes\w_tools.inc" - use "writer\optional\includes\clipboard\clipbrd_func.inc" - use "writer\optional\includes\clipboard\w_210_.inc" - use "writer\optional\includes\clipboard\w_211_.inc" - use "writer\optional\includes\clipboard\w_212_.inc" - use "writer\optional\includes\clipboard\w_213_.inc" - use "writer\optional\includes\clipboard\w_214_.inc" - use "writer\optional\includes\clipboard\w_215_.inc" - use "writer\optional\includes\clipboard\w_216_.inc" - use "writer\optional\includes\clipboard\w_217_.inc" - use "writer\optional\includes\clipboard\w_218_.inc" - use "writer\optional\includes\clipboard\w_219_.inc" - use "writer\optional\includes\clipboard\w_220_.inc" - use "writer\optional\includes\clipboard\w_221_.inc" - use "writer\optional\includes\clipboard\w_222_.inc" - Dim Start : Start = Now() + use "writer\tools\includes\w_tools.inc" + use "writer\optional\includes\clipboard\clipbrd_func.inc" + use "writer\optional\includes\clipboard\w_210_.inc" + use "writer\optional\includes\clipboard\w_211_.inc" + use "writer\optional\includes\clipboard\w_212_.inc" + use "writer\optional\includes\clipboard\w_213_.inc" + use "writer\optional\includes\clipboard\w_214_.inc" + use "writer\optional\includes\clipboard\w_215_.inc" + use "writer\optional\includes\clipboard\w_216_.inc" + use "writer\optional\includes\clipboard\w_217_.inc" + use "writer\optional\includes\clipboard\w_218_.inc" + use "writer\optional\includes\clipboard\w_219_.inc" + use "writer\optional\includes\clipboard\w_220_.inc" + use "writer\optional\includes\clipboard\w_221_.inc" + use "writer\optional\includes\clipboard\w_222_.inc" + Dim Start : Start = Now() + Dim lsSourceList(3) as string + + ' copy needed files linked in test documents lo local file system if needed Issue #112208 + lsSourceList(0) = 3 + lsSourceList(1) = ConvertPath ( gtesttoolpath & "writer\optional\input\clipboard\dummy.sxw" ) + lsSourceList(2) = ConvertPath ( gtesttoolpath & "writer\optional\input\clipboard\dummy.txt" ) + lsSourceList(3) = ConvertPath ( gtesttoolpath & "writer\optional\input\clipboard\flower.gif" ) + + if hFileListCopyLocal(lsSourceList()) = false then + warnlog "Copying of elementary files failed. Test interrupted!" + exit sub + end if ExportSet = wChangeHTMLCompatibilityExport CharsetSet = wChangeHTMLCompatibility @@ -72,9 +84,9 @@ sub main Call hStatusOut Call wChangeHTMLCompatibility(CharsetSet) - Call wChangeHTMLCompatibilityExport(ExportSet) + Call wChangeHTMLCompatibilityExport(ExportSet) - printlog "Duration : " + Wielange ( Start ) + printlog "Duration : " + Wielange ( Start ) end sub '--------------------------------------------------------- diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc index 8cd43ccbcbae..1fc2001e78bb 100644 --- a/testautomation/writer/required/includes/w_001_.inc +++ b/testautomation/writer/required/includes/w_001_.inc @@ -773,9 +773,7 @@ testcase tFileSaveAsExport Call hNewDocument PrintLog "Open document '..\writer\required\input\st1_1.sxw" - Call hFileOpen(xExport) - - Call sMakeReadOnlyDocumentEditable + Call hFileOpenLocally(xExport) PrintLog "Select Save as .. and choose 'Microsoft Word 97/2000/XP' as export-filter" xExportFile = gOfficepath + "user\work\ecksport.doc" @@ -1029,7 +1027,7 @@ testcase tFileReload Wait (500) PrintLog "Open previous saved document" - Call hFileOpen ( gOfficePath + "user\work\" + sFile$ ) + hFileOpen( gOfficePath + "user\work\" + sFile$ ) PrintLog "Insert a table in document" Call hTabelleEinfuegen PrintLog "File / Reload" diff --git a/testautomation/writer/required/includes/w_001b_.inc b/testautomation/writer/required/includes/w_001b_.inc index e20d497482f0..297d04b579bb 100644 --- a/testautomation/writer/required/includes/w_001b_.inc +++ b/testautomation/writer/required/includes/w_001b_.inc @@ -125,7 +125,7 @@ testcase tFileSendOutlineToPresentation goto endsub end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Kontext "Navigator" if Navigator.Exists then Navigator.Close Sleep 1 @@ -176,7 +176,7 @@ testcase tFileSendOutlineToClipboard end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Sleep 1 PrintLog "File / Send / Outline to Clipboard" try @@ -223,7 +223,7 @@ testcase tFileSendCreateAutoabstract end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Kontext "Navigator" if Navigator.Exists then Navigator.Close Sleep 1 @@ -274,7 +274,7 @@ testcase tFileSendAutoabstractToPresentation end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Kontext "Navigator" if Navigator.Exists then Navigator.Close Sleep 1 @@ -399,7 +399,7 @@ testcase tMasterDocFileSaveWithPassword FileClose WaitSlot(2000) PrintLog "Open previous saved document" - Call hFileOpen(Datei$) + Call hFileOpen( Datei$) Kontext "PasswordFileOpen" PrintLog "Enter a wrong password." @@ -427,7 +427,7 @@ testcase tMasterDocFileSaveWithPassword Sleep 1 PrintLog "File / Open again your previous saved document" - Call hFileOpen(Datei$) + Call hFileOpen( Datei$) PrintLog "Enter your password in password dialog" Kontext "PasswordFileOpen" if PasswordFileOpen.Exists then @@ -468,7 +468,7 @@ testcase tMasterDocFileSaveWithPassword Sleep 1 FileClose PrintLog "File / Close and open your document again" - Call hFileOpen(Datei$) + hFileOpen( Datei$) Sleep 1 Kontext "PasswordFileOpen" PrintLog "Now the passwort dialog should come up" @@ -517,7 +517,7 @@ testcase tMasterDocFileReload endif PrintLog "Open previous saved document" - Call hFileOpen ( sDocumentPath ) + Call hFileOpen( sDocumentPath ) PrintLog "Insert a table in document" Call hTabelleEinfuegen @@ -652,7 +652,7 @@ testcase tMasterDocFileSendOutlineToPresentation gApplication = "MASTERDOCUMENT" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) Kontext "Navigator" if ( Navigator.Exists ) then @@ -698,7 +698,7 @@ testcase tMasterDocFileSendOutlineToClipboard Dim sFile as string : sFile = "htmltest.sxg" PrintLog "- File / Send / Outline to Clipboard" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) PrintLog "File / Send / Outline to Clipboard" try @@ -738,7 +738,7 @@ testcase tMasterDocFileSendCreateAutoabstract Dim sFile as string : sFile = "htmltest.sxg" PrintLog "- File / Send / Create Autoabstract" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) Kontext "Navigator" hCloseDialog( Navigator, "Close,optional" ) @@ -788,7 +788,7 @@ testcase tMasterDocFileSendAutoabstractToPresentation PrintLog "- File / Send / Autoabstract to Presentation" PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) Kontext "Navigator" hCloseDialog( Navigator, "Close,optional" ) diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 94fa0d70f9f9..20b468c9605c 100644 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -84,8 +84,7 @@ testcase tToolsSpellcheck Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." goto endsub end if - hFileOpen ( TheFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( TheFile ) printlog " Insert some faulty text" select case iSprache @@ -246,8 +245,7 @@ testcase tToolsThesaurus Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." goto endsub end if - call hFileOpen( TheFile ) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally( TheFile ) printlog " Insert some faulty text" select case iSprache @@ -337,7 +335,7 @@ testcase tToolsHyphenation Select Case gApplication Case "WRITER" - hFileOpen( DieDatei ) + hFileOpenLocally( DieDatei ) Case "MASTERDOCUMENT" if wInsertDocumentinMasterDoc(DieDatei) = False then @@ -354,7 +352,6 @@ testcase tToolsHyphenation goto endsub end select - Call sMakeReadOnlyDocumentEditable printlog " Insert file 'writer\required\input\linguistik\0 + [OfficeLanguage] + '.odt'" Sleep 1 Call wTypeKeys ("<Mod1 Home>") @@ -986,8 +983,7 @@ testcase tToolsHangulHanjaConversion bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog " Open the test file" - hFileOpen (sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(sTestFile) Call wTypeKeys("<MOD1 Home>") printlog " Tools / HangulHanjaConversion" @@ -1126,8 +1122,7 @@ testcase tHtmlDocToolsHangulHanjaConversion bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog " Open the test file" - hFileOpen (sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(sTestFile) Call wTypeKeys("<MOD1 Home>") printlog " Tools / HangulHanjaConversion" @@ -1238,7 +1233,7 @@ testcase tMasterDocToolsHyphenation hUseAsyncSlot( "EditPaste" ) end if - Call sMakeReadOnlyDocumentEditable + printlog " Insert file 'writer\required\input\linguistik\0 + [OfficeLanguage] + '.odt'" Sleep 1 Call wTypeKeys ("<Mod1 Home>") diff --git a/testautomation/writer/tools/includes/w_tool3.inc b/testautomation/writer/tools/includes/w_tool3.inc index 16fd825f6447..5aa58e2f967c 100644 --- a/testautomation/writer/tools/includes/w_tool3.inc +++ b/testautomation/writer/tools/includes/w_tool3.inc @@ -270,7 +270,7 @@ sub UndoRichtigBeiSortierung if Fehler = TRUE then Warnlog "Undo after sorting has not been functioned correctly" Call hCloseDocument - Call hFileOpen ( gTesttoolPath + "writer\optional\input\st1_5.sdw" ) + hFileOpenLocally( gTesttoolPath + "writer\optional\input\st1_5.sdw" ) end if Call wTypeKeys "<End>" Call wTypeKeys "<Down>",6 diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index 27b9526bb0de..e6bd4f92afa0 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -1042,7 +1042,7 @@ end sub function wInsertDocumentinMasterDoc(DocumentName as string) as boolean Call hNewDocument - Call hFileOpen(DocumentName) + hFileOpenLocally( DocumentName) Sleep 2 Call wTypeKeys "<Mod1 A>" Sleep 2 |