[Libreoffice-commits] .: 3 commits - Makefile.top README.cross smoketest/data

[Libreoffice Gerrit user]

 Makefile.top              |    1 -
 README.cross              |    1 -
 smoketest/data/Global.xml |   31 +++++--------------------------
 3 files changed, 5 insertions(+), 28 deletions(-)

New commits:
commit 7f97d3140735126d0b89a0675985776cf2acb6d4
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Nov 10 03:39:50 2012 -0600

    adjust README.cross to reflect binfitler removal
    
    Change-Id: Iee3fa02bde03ced462460e4ba3e17200f47a27e5

diff --git a/README.cross b/README.cross
index 833e177..06123b6 100644
--- a/README.cross
+++ b/README.cross
@@ -136,7 +136,6 @@ CXX_FOR_BUILD=ccache g++
 --host=i686-w64-mingw32
 --with-distro=LibreOfficeWin32
 --disable-activex
---disable-binfilter
 --disable-build-mozilla
 --disable-directx
 --disable-ext-nlpsolver
commit c8139c6f1a8dc8dc2b0d13919afffbee869605cc
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Nov 10 03:39:17 2012 -0600

    do not even try to do binfilter test in smoketest
    
    Change-Id: I81fa1217feda5b4faf73add5304e8a191bbfbdc3

diff --git a/smoketest/data/Global.xml b/smoketest/data/Global.xml
index 9ae271e..a445283 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
commit bbd4b99c8199347f1a40655cce39ab44df04a17a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Nov 10 03:38:45 2012 -0600

    binfilter is not a dmake module anymore...
    
    Change-Id: Iec1e114fd6803624ad5ef6812ab50c8e8a4695fa

diff --git a/Makefile.top b/Makefile.top
index 5ab6e59..42e63a0 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -217,7 +217,6 @@ zlib\
 
 dmake_modules:=\
 berkeleydb\
-binfilter \
 cairo\
 cppunit\
 crashrep\