[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - basic/qa

[Tor Lillqvist]

 basic/qa/cppunit/test_vba.cxx              |   10 +++++-----
 basic/qa/vba_tests/ole_dfltObjDflMethod.vb |   24 ------------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

New commits:
commit 4e5e00dad2593d677be74f96d72477a8531afcdb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Oct 17 13:28:13 2017 +0300

    Seems that testMiscOLEStuff() works only as 64-bit on a current Windows 10
    
    Change-Id: Ib43f8c185d2a2e9e93f34d918d6f9461586cf6a6
    (cherry picked from commit 66b3970c946bd25647484ea1ac2c2e62bd9fb7b4)
    Reviewed-on: https://gerrit.libreoffice.org/44406
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 8b46d739f81d..eb959e9c78df 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -145,7 +145,11 @@ void VBATest::testMiscOLEStuff()
 // Not much point even trying to run except on Windows.
 // (Without Excel doesn't really do anything anyway,
 // see "so skip test" below.)
-#if defined(_WIN32)
+
+// Since some time, on a properly updated Windows 10, this works
+// only with a 64-bit LibreOffice
+
+#if defined(_WIN64)
     // test if we have the necessary runtime environment
     // to run the OLE tests.
     uno::Reference< lang::XMultiServiceFactory > xOLEFactory;
@@ -185,10 +189,6 @@ void VBATest::testMiscOLEStuff()
     const char* macroSource[] = {
         "ole_ObjAssignNoDflt.vb",
         "ole_ObjAssignToNothing.vb",
-#if !defined(_WIN64)
-        // This test uses Microsoft.Jet.OLEDB.4.0 Provider, that is unavailable on Win64
-        "ole_dfltObjDflMethod.vb",
-#endif
     };
 
     OUString sMacroPathURL = m_directories.getURLFromSrc("/basic/qa/vba_tests/");
diff --git a/basic/qa/vba_tests/ole_dfltObjDflMethod.vb b/basic/qa/vba_tests/ole_dfltObjDflMethod.vb
deleted file mode 100644
index 9ac50d9b5f9e..000000000000
--- a/basic/qa/vba_tests/ole_dfltObjDflMethod.vb
+++ /dev/null
@@ -1,24 +0,0 @@
-Option VBASupport 1
-Option Explicit
-
-Rem Test accessing an object that has default object member
-Rem which in turn has a default member that is a method
-Function doUnitTest(TestData As String, Driver as String) As String
-doUnitTest = "Begin"
-Dim modifiedTimout As Long
-Dim cnn1 As New ADODB.Connection
-Dim rst1 As New ADODB.Recordset
-Dim conStr As String
-cnn1.Open "Provider=Microsoft.Jet.OLEDB.4.0;" & _
-"Data Source=" & TestData & ";" & _
-"Extended Properties=""Excel 8.0;HDR=Yes"";"
-rst1.Open "SELECT * FROM [Sheet1$];", cnn1, adOpenStatic, adLockReadOnly
-Dim val
-val = rst1("FirstName")
-If val = "Paddy" Then
-    doUnitTest = "OK"
-Else
-    doUnitTest = "Failed, expected 'Paddy' got " & val
-End If
-
-End Function