diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-09-19 14:45:06 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-09-19 15:31:07 +0100 |
| commit | 857f72dfe32b269a864dc30e687ce5920d1c0fda (patch) | |
| tree | 032f87a8d141dea9a7a6ee9674c6b3561a08ce6f /basic/qa | |
| parent | 01e14011e5b38fbfa713f4dcd8ca5bf2ed75c436 (diff) | |
vba - disable Currency test / invocation on master.
We're missing an effective SbxCURRENCY conversion here.
Change-Id: Id6530ed3a93623b31089304f3451d9693ab4f3af
Diffstat (limited to 'basic/qa')
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 2 | ||||
| -rw-r--r-- | basic/qa/vba_tests/win32compat.vb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 777b94ad49dc..936cce31004e 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -51,7 +51,9 @@ void VBATest::testMiscVBAFunctions() "format.vb", "replace.vb", "stringplusdouble.vb", +#ifndef WIN32 // missing 64bit Currency marshalling. "win32compat.vb", // windows compatibility hooks. +#endif "win32compatb.vb" // same methods, different signatures. }; OUString sMacroPathURL = getURLFromSrc("/basic/qa/vba_tests/"); diff --git a/basic/qa/vba_tests/win32compat.vb b/basic/qa/vba_tests/win32compat.vb index 7697648ddc93..681d33071283 100644 --- a/basic/qa/vba_tests/win32compat.vb +++ b/basic/qa/vba_tests/win32compat.vb @@ -18,8 +18,8 @@ Dim passCount As Integer Dim failCount As Integer Dim result As String -Private Declare Function QueryPerformanceCounter Lib "kernel32" (lpPerformanceCount As Currency) As Long -Private Declare Function QueryPerformanceFrequency Lib "kernel32" (lpFrequency As Currency) As Long +Private Declare Function QueryPerformanceCounter Lib "kernel32" (ByRef lpPerformanceCount As Currency) As Long +Private Declare Function QueryPerformanceFrequency Lib "kernel32" (ByRef lpFrequency As Currency) As Long ' FIXME: all this cut/paste should be factored out ! @@ -61,7 +61,7 @@ Function verify_win32compat() as String Exit Function errorHandler: - TestLog_ASSERT (False), "hit error handler" + TestLog_ASSERT (False), "hit error handler - " & Err & ": " & Error$ & " (line : " & Erl & ")" verify_win32compat = result End Function |