Kaydet (Commit) 0ea3ef86 authored tarafından Caolán McNamara's avatar Caolán McNamara

better test for this that doesn't depend on env

üst 43f8cba7
...@@ -114,6 +114,8 @@ Global bMakeSaveOpen8Test as boolean ...@@ -114,6 +114,8 @@ Global bMakeSaveOpen8Test as boolean
global sExtensionURL as string global sExtensionURL as string
global oBinFilterComp as Object
Dim gDlgState as Integer Dim gDlgState as Integer
Sub SetGlobalDoc Sub SetGlobalDoc
...@@ -145,6 +147,8 @@ Sub Main ...@@ -145,6 +147,8 @@ Sub Main
gCurrentDocTest = frmTestClosure gCurrentDocTest = frmTestClosure
gCurrentTestCase = cLogfileFailed gCurrentTestCase = cLogfileFailed
oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" )
DeleteAllSavedFiles() DeleteAllSavedFiles()
DeleteAllLogFiles() DeleteAllLogFiles()
SetupWorkPath() SetupWorkPath()
...@@ -532,10 +536,10 @@ Sub SetGlobalOptionsDialog () ...@@ -532,10 +536,10 @@ Sub SetGlobalOptionsDialog ()
REM create dialog control REM create dialog control
gOptionsDialog = CreateUnoDialog( oInputStreamProvider ) gOptionsDialog = CreateUnoDialog( oInputStreamProvider )
if Environ("WITH_BINFILTER") <> "YES" then if not isNull(oBinFilterComp) then
oControl = gOptionsDialog.getControl("cbOpen50Test") oControl = gOptionsDialog.getControl("cbOpen50Test")
oControl.Model.setPropertyValue("Enabled", FALSE) oControl.Model.setPropertyValue("Enabled", FALSE)
End If end If
end Sub end Sub
...@@ -593,11 +597,11 @@ Sub GetOptions ...@@ -593,11 +597,11 @@ Sub GetOptions
gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc))) gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)))
gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc))) gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc)))
gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, 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))) gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
else else
gOptionsDialog.getControl("cbOpen50Test").setState(0) gOptionsDialog.getControl("cbOpen50Test").setState(0)
End If end If
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc))) gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc))) gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
End Sub End Sub
...@@ -615,7 +619,7 @@ Sub ReadOptions ...@@ -615,7 +619,7 @@ Sub ReadOptions
bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc) bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)
bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc) bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc)
bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc) bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)
if Environ("WITH_BINFILTER") = "YES" then if not isNull(oBinFilterComp) then
bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc) bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
else else
bMakeOpen50Test = false bMakeOpen50Test = false
...@@ -643,7 +647,7 @@ Sub SetDefaultOptions ...@@ -643,7 +647,7 @@ Sub SetDefaultOptions
End If End If
bMakeSaveOpenXMLTest = true bMakeSaveOpenXMLTest = true
REM Disable StarOffice 5.0 tests in case binfilter has not been included 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 bMakeOpen50Test = true
else else
bMakeOpen50Test = false bMakeOpen50Test = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment