Kaydet (Commit) c8139c6f authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

do not even try to do binfilter test in smoketest

Change-Id: I81fa1217feda5b4faf73add5304e8a191bbfbdc3
üst bbd4b99c
...@@ -105,16 +105,10 @@ Global bMakeSaveOpen8Test as boolean, bMakeMacrosTest as boolean ...@@ -105,16 +105,10 @@ Global bMakeSaveOpen8Test as boolean, bMakeMacrosTest 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
gOutputDoc = ThisComponent 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 end Sub
Sub ClearStatus Sub ClearStatus
...@@ -534,10 +528,8 @@ Sub SetGlobalOptionsDialog () ...@@ -534,10 +528,8 @@ Sub SetGlobalOptionsDialog ()
REM create dialog control REM create dialog control
gOptionsDialog = CreateUnoDialog( oInputStreamProvider ) gOptionsDialog = CreateUnoDialog( oInputStreamProvider )
if isNull(oBinFilterComp) then oControl = gOptionsDialog.getControl("cbOpen50Test")
oControl = gOptionsDialog.getControl("cbOpen50Test") oControl.Model.setPropertyValue("Enabled", FALSE)
oControl.Model.setPropertyValue("Enabled", FALSE)
end If
end Sub end Sub
...@@ -596,11 +588,7 @@ Sub GetOptions ...@@ -596,11 +588,7 @@ 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 not isNull(oBinFilterComp) then gOptionsDialog.getControl("cbOpen50Test").setState(0)
gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
else
gOptionsDialog.getControl("cbOpen50Test").setState(0)
end If
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc))) gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
gOptionsDialog.getControl("cbMacrosTest").setState( -( GetUserFieldState (cUserFieldTestMacros, gOutputDoc))) gOptionsDialog.getControl("cbMacrosTest").setState( -( GetUserFieldState (cUserFieldTestMacros, gOutputDoc)))
gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc))) gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
...@@ -619,11 +607,7 @@ Sub ReadOptions ...@@ -619,11 +607,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 not isNull(oBinFilterComp) then bMakeOpen50Test = false
bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
else
bMakeOpen50Test = false
End If
bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc) bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)
bMakeMacrosTest = GetUserFieldState (cUserFieldTestMacros, gOutputDoc) bMakeMacrosTest = GetUserFieldState (cUserFieldTestMacros, gOutputDoc)
bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc) bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)
...@@ -647,12 +631,7 @@ Sub SetDefaultOptions ...@@ -647,12 +631,7 @@ Sub SetDefaultOptions
bMakeExtensionTest = true bMakeExtensionTest = true
End If End If
bMakeSaveOpenXMLTest = true bMakeSaveOpenXMLTest = true
REM Disable StarOffice 5.0 tests in case binfilter has not been included bMakeOpen50Test = false
if not isNull(oBinFilterComp) then
bMakeOpen50Test = true
else
bMakeOpen50Test = false
End If
bMakeSaveOpen8Test = true bMakeSaveOpen8Test = true
bMakeMacrosTest = true bMakeMacrosTest = true
bMakeTerminateAfterTest = false bMakeTerminateAfterTest = 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