diff options
| author | hde <hde@openoffice.org> | 2011-01-17 09:32:10 +0100 |
|---|---|---|
| committer | hde <hde@openoffice.org> | 2011-01-17 09:32:10 +0100 |
| commit | 35c0ef207e83e40704effbefa18a2a78bf88ac8e (patch) | |
| tree | 52f1a363774c57b16a0b51a1851df232231ec75a /testautomation/writer/optional | |
| parent | d6759d385d83959b3320f4c65689e85086f5dc3e (diff) | |
#i116393#removed bin filters from autotest
Diffstat (limited to 'testautomation/writer/optional')
| -rw-r--r-- | testautomation/writer/optional/includes/loadsave/w_loadsave.inc | 45 | ||||
| -rw-r--r-- | testautomation/writer/optional/includes/number/w_207_.inc | 15 |
2 files changed, 16 insertions, 44 deletions
diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index f8dd252cd174..33768d6ffc38 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -217,7 +217,7 @@ testcase tExportAllReadableFormatsIntoThemselves end if app.Mkdir sWorkDirectory - For iCurrentFileIndex = 7 to 7 + For iCurrentFileIndex = 1 to 7 select case iCurrentFileIndex case 1 : sCurrentFile = "xml2.odt" sCurrentFilter = "writer8" @@ -225,49 +225,18 @@ testcase tExportAllReadableFormatsIntoThemselves 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" + case 4 : sCurrentFile = "html.html" sCurrentFilter = "HTML (StarWriter)" - case 12 : sCurrentFile = "rtf.rtf" + case 5 : sCurrentFile = "rtf.rtf" sCurrentFilter = "Rich Text Format" - case 13 : sCurrentFile = "sw60.sxw" + case 6 : sCurrentFile = "sw60.sxw" sCurrentFilter = "StarOffice XML (Writer)" - case 14 : sCurrentFile = "winw97.doc" + case 7 : sCurrentFile = "winw97.doc" sCurrentFilter = "MS Word 97" - case 15 : sCurrentFile = "winword6.doc" + case 8 : sCurrentFile = "winword6.doc" sCurrentFilter = "MS Word 95" - case 16 : sCurrentFile = "wintext.txt" + case 9 : 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 diff --git a/testautomation/writer/optional/includes/number/w_207_.inc b/testautomation/writer/optional/includes/number/w_207_.inc index 4bc525553f56..f7dc315239f2 100644 --- a/testautomation/writer/optional/includes/number/w_207_.inc +++ b/testautomation/writer/optional/includes/number/w_207_.inc @@ -106,12 +106,15 @@ testcase tToolsNumbering12 "." & sCurrentFilterExt ) hDeleteFile( ExportFileName ) ' There should never be a reason to overwrite - printlog " - export as: " & ExportFileName - Call hFileSaveAsWithFilter( ExportFileName, sCurrentFilter ) - Call hCloseDocument - - printlog " - load previous saved document" - hFileOpen( ExportFileName ) + ' Binary export filter was removed + if iDocumentType < 3 + printlog " - export as: " & ExportFileName + Call hFileSaveAsWithFilter( ExportFileName, sCurrentFilter ) + Call hCloseDocument + + printlog " - load previous saved document" + hFileOpen( ExportFileName ) + endif printlog " - close document" hFileCloseAll() |