diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-10 03:39:17 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-10 03:39:17 -0600 |
commit | c8139c6f1a8dc8dc2b0d13919afffbee869605cc (patch) | |
tree | b533fa210f2152b2f63a4ce706a3c7540b46cace /smoketest | |
parent | bbd4b99c8199347f1a40655cce39ab44df04a17a (diff) |
do not even try to do binfilter test in smoketest
Change-Id: I81fa1217feda5b4faf73add5304e8a191bbfbdc3
Diffstat (limited to 'smoketest')
-rw-r--r-- | smoketest/data/Global.xml | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/smoketest/data/Global.xml b/smoketest/data/Global.xml index 9ae271e8dea3..a445283aba2f 100644 --- a/smoketest/data/Global.xml +++ b/smoketest/data/Global.xml @@ -105,16 +105,10 @@ Global bMakeSaveOpen8Test as boolean, bMakeMacrosTest as boolean global sExtensionURL as string -global oBinFilterComp as Object - Dim gDlgState as Integer Sub SetGlobalDoc gOutputDoc = ThisComponent - REM need to have the binfilter component, and SRC_ROOT set to find sample docs - if Environ("SRC_ROOT") <> "" then - oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" ) - End If end Sub Sub ClearStatus @@ -534,10 +528,8 @@ Sub SetGlobalOptionsDialog () REM create dialog control gOptionsDialog = CreateUnoDialog( oInputStreamProvider ) - if isNull(oBinFilterComp) then - oControl = gOptionsDialog.getControl("cbOpen50Test") - oControl.Model.setPropertyValue("Enabled", FALSE) - end If + oControl = gOptionsDialog.getControl("cbOpen50Test") + oControl.Model.setPropertyValue("Enabled", FALSE) end Sub @@ -596,11 +588,7 @@ Sub GetOptions gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc))) gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc))) gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc))) - if not isNull(oBinFilterComp) then - gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc))) - else - gOptionsDialog.getControl("cbOpen50Test").setState(0) - end If + gOptionsDialog.getControl("cbOpen50Test").setState(0) gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc))) gOptionsDialog.getControl("cbMacrosTest").setState( -( GetUserFieldState (cUserFieldTestMacros, gOutputDoc))) gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc))) @@ -619,11 +607,7 @@ Sub ReadOptions bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc) bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc) bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc) - if not isNull(oBinFilterComp) then - bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc) - else - bMakeOpen50Test = false - End If + bMakeOpen50Test = false bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc) bMakeMacrosTest = GetUserFieldState (cUserFieldTestMacros, gOutputDoc) bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc) @@ -647,12 +631,7 @@ Sub SetDefaultOptions bMakeExtensionTest = true End If bMakeSaveOpenXMLTest = true - REM Disable StarOffice 5.0 tests in case binfilter has not been included - if not isNull(oBinFilterComp) then - bMakeOpen50Test = true - else - bMakeOpen50Test = false - End If + bMakeOpen50Test = false bMakeSaveOpen8Test = true bMakeMacrosTest = true bMakeTerminateAfterTest = false |