diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:50:06 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:50:06 +0200 |
| commit | 387640f31642a18988f15d1377a60e2b6018cf47 (patch) | |
| tree | a364b5412f4169b2842ed62cb2dc2ed0b08be485 | |
| parent | e0008d6df85f181b98c670916a4e104615c2a6d1 (diff) | |
| parent | 45ac455618d67853fa40e54c5e4416e963224033 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/testing
| -rw-r--r-- | smoketestdoc/data/Global.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml index ef178e15a..42b76f4c5 100644 --- a/smoketestdoc/data/Global.xml +++ b/smoketestdoc/data/Global.xml @@ -532,7 +532,7 @@ Sub SetGlobalOptionsDialog () REM create dialog control gOptionsDialog = CreateUnoDialog( oInputStreamProvider ) - if Environ("WITH_BINFILTER") = "NO" then + if Environ("WITH_BINFILTER") <> "YES" then oControl = gOptionsDialog.getControl("cbOpen50Test") oControl.Model.setPropertyValue("Enabled", FALSE) End If @@ -593,10 +593,10 @@ 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") = "NO" then - gOptionsDialog.getControl("cbOpen50Test").setState(0) - else + if Environ("WITH_BINFILTER") = "YES" then gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc))) + else + gOptionsDialog.getControl("cbOpen50Test").setState(0) End If gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc))) gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc))) @@ -615,10 +615,10 @@ Sub ReadOptions bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc) bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc) bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc) - if Environ("WITH_BINFILTER") = "NO" then - bMakeOpen50Test = false - else + if Environ("WITH_BINFILTER") = "YES" then bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc) + else + bMakeOpen50Test = false End If bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc) bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc) @@ -643,10 +643,10 @@ Sub SetDefaultOptions End If bMakeSaveOpenXMLTest = true REM Disable StarOffice 5.0 tests in case binfilter has not been included - if Environ("WITH_BINFILTER") = "NO" then - bMakeOpen50Test = false - else + if Environ("WITH_BINFILTER") = "YES" then bMakeOpen50Test = true + else + bMakeOpen50Test = false End If bMakeSaveOpen8Test = true bMakeTerminateAfterTest = false |