Kaydet (Commit) 66b3970c authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Seems that testMiscOLEStuff() works only as 64-bit on a current Windows 10

Change-Id: Ib43f8c185d2a2e9e93f34d918d6f9461586cf6a6
üst 76f102e1
......@@ -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/");
......
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
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