diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-10-17 13:28:13 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-10-17 18:57:54 +0300 |
| commit | 66b3970c946bd25647484ea1ac2c2e62bd9fb7b4 (patch) | |
| tree | 58db51c88253919f23245cca1dfb4c1ea5b7a6bc /basic | |
| parent | 76f102e1a96c7e0906afb11854dd5c9e24247ccb (diff) | |
Seems that testMiscOLEStuff() works only as 64-bit on a current Windows 10
Change-Id: Ib43f8c185d2a2e9e93f34d918d6f9461586cf6a6
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 10 | ||||
| -rw-r--r-- | basic/qa/vba_tests/ole_dfltObjDflMethod.vb | 24 |
2 files changed, 5 insertions, 29 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 0289f641f771..d153a1d62f82 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -180,7 +180,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; @@ -220,10 +224,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 |