diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 22:27:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-23 10:35:44 +0100 |
| commit | 0ea3ef86a189197b4b8f8a4a7180b9070b94741f (patch) | |
| tree | a35dc57f28d822f3f68568cd36b377e3be078483 /smoketestdoc | |
| parent | 43f8cba7d238e6db25e05edd0d9713dcc42fc861 (diff) | |
better test for this that doesn't depend on env
Diffstat (limited to 'smoketestdoc')
| -rw-r--r-- | smoketestdoc/data/Global.xml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml index ce8807ea74de..874f1277ad75 100644 --- a/smoketestdoc/data/Global.xml +++ b/smoketestdoc/data/Global.xml @@ -114,6 +114,8 @@ Global bMakeSaveOpen8Test as boolean global sExtensionURL as string +global oBinFilterComp as Object + Dim gDlgState as Integer Sub SetGlobalDoc @@ -145,6 +147,8 @@ Sub Main gCurrentDocTest = frmTestClosure gCurrentTestCase = cLogfileFailed + oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" ) + DeleteAllSavedFiles() DeleteAllLogFiles() SetupWorkPath() @@ -532,10 +536,10 @@ Sub SetGlobalOptionsDialog () REM create dialog control gOptionsDialog = CreateUnoDialog( oInputStreamProvider ) - if Environ("WITH_BINFILTER") <> "YES" then + if not isNull(oBinFilterComp) then oControl = gOptionsDialog.getControl("cbOpen50Test") oControl.Model.setPropertyValue("Enabled", FALSE) - End If + end If end Sub @@ -593,11 +597,11 @@ Sub GetOptions gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc))) gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc))) gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc))) - if Environ("WITH_BINFILTER") = "YES" then + if not isNull(oBinFilterComp) then gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc))) else gOptionsDialog.getControl("cbOpen50Test").setState(0) - End If + end If gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc))) gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc))) End Sub @@ -615,7 +619,7 @@ Sub ReadOptions bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc) bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc) bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc) - if Environ("WITH_BINFILTER") = "YES" then + if not isNull(oBinFilterComp) then bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc) else bMakeOpen50Test = false @@ -643,7 +647,7 @@ Sub SetDefaultOptions End If bMakeSaveOpenXMLTest = true REM Disable StarOffice 5.0 tests in case binfilter has not been included - if Environ("WITH_BINFILTER") = "YES" then + if not isNull(oBinFilterComp) then bMakeOpen50Test = true else bMakeOpen50Test = false |