diff options
Diffstat (limited to 'testautomation/writer/optional/includes/option/wr_o_4.inc')
| -rwxr-xr-x[-rw-r--r--] | testautomation/writer/optional/includes/option/wr_o_4.inc | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc index de44cdfea13a..83f09e5c7e89 100644..100755 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -24,7 +24,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : '* @@ -293,9 +293,8 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() + endcase '------------------------------------------------------------------------------ @@ -740,9 +739,8 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() + endcase '------------------------------------------------------------------------------ @@ -852,15 +850,17 @@ testcase tToolsOptionsWriterGeneral Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() + endcase '------------------------------------------------------------------------------ testcase tToolsOptionsWriterMailMerge + warnlog( "#i111914# - Test excluded, needs review" ) + goto endsub + Call hNewDocument printlog ("- Tools/Options/Writer: Mail Merge ") Kontext "Navigator" @@ -872,7 +872,7 @@ testcase tToolsOptionsWriterMailMerge printlog " - fill out Mail Settings" Kontext "TabMailMergeEmail" YourName.Settext "Fredrik Haegg" - EmailAddress.Settext "helge.delfs@sun.com" + EmailAddress.Settext "helge.delfs@oracle.com" SendReplies.Check ReplyAddress.Settext "fredrikh@openoffice.org" ServerName.Settext "MySMTP-Server" @@ -926,7 +926,7 @@ testcase tToolsOptionsWriterMailMerge Kontext "TabMailMergeEmail" if YourName.Gettext <> "Fredrik Haegg" then Warnlog "'Your Name' has been changed after a restart" - if EmailAddress.Gettext <> "helge.delfs@sun.com" then Warnlog "'Email Address' has been changed after a restart" + if EmailAddress.Gettext <> "helge.delfs@oracle.com" then Warnlog "'Email Address' has been changed after a restart" if Not SendReplies.IsChecked then Warnlog "'Send replies' has been changed after a restart" if ReplyAddress.Gettext <> "fredrikh@openoffice.org" then Warnlog "'Reply adresses' has been changed after a restart" if ServerName.Gettext <> "MySMTP-Server" then Warnlog "'Server name' has been changed after a restart" @@ -985,8 +985,7 @@ testcase tToolsOptionsWriterMailMerge Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Ok - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() + endcase '------------------------------------------------------------------------------ |