forked from amazingfate/loongoffice
014bd12ed0
Commit 9cdb73ff28c4cd6380412468f34ff10e46292a07 (INTEGRATION: CWS jl5vba (1.25.94); FILE MERGED, 2004-03-17) has introduced handling of decimal, currency, and date for VBASupport mode in sbunoobj.cxx. However, in getUnoTypeForSbxBaseType, it changed the behavior for date type in the non-VBASupport mode, obviously by mistake. This change swaps the code in the 'if' branches, to what appears to be the original intention. Change-Id: I88cddf7cec1a980f56de96ae1c5e64d8e7630b77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180637 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 63e7a70ad1a6a8ec4190ab510f683d2fc9dea417) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180674 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
49 lines
1.7 KiB
QBasic
49 lines
1.7 KiB
QBasic
'
|
|
' This file is part of the LibreOffice project.
|
|
'
|
|
' This Source Code Form is subject to the terms of the Mozilla Public
|
|
' License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
' file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
'
|
|
|
|
Option Explicit
|
|
|
|
Function doUnitTest() As String
|
|
TestUtil.TestInit
|
|
verify_DatePassedToUno
|
|
doUnitTest = TestUtil.GetResult()
|
|
End Function
|
|
|
|
Sub verify_DatePassedToUno
|
|
On Error GoTo errorHandler
|
|
|
|
' Given a date variable, and passing it to an UNO interface method (i.e., going through
|
|
' the Basic-to-UNO conversion), in the absence of VBASupport mode, the date value must
|
|
' be converted to a number, not to a struct / empty interface
|
|
Dim aDate as Date
|
|
aDate = #2025-01-23T12:00#
|
|
|
|
Dim aUnoObject as Object
|
|
aUnoObject = CreateUnoListener("XTypeConverter_", "com.sun.star.script.XTypeConverter")
|
|
|
|
Dim aConvResult
|
|
' Without the fix, the following line would fail, triggering errorHandler reporting
|
|
' "91: Object variable not set."
|
|
aConvResult = aUnoObject.convertToSimpleType(aDate, com.sun.star.uno.TypeClass.STRING)
|
|
' If 'Option VBASupport 1' were used, the following line would fail with "Wrong input
|
|
' type: Date", because the value would be marshalled using oleautomation::Date struct
|
|
TestUtil.AssertEqualStrict(aConvResult, "45680.5", "aConvResult")
|
|
|
|
Exit Sub
|
|
errorHandler:
|
|
TestUtil.ReportErrorHandler("verify_DatePassedToUno", Err, Error$, Erl)
|
|
End Sub
|
|
|
|
Function XTypeConverter_convertToSimpleType(aFrom, aDestinationType)
|
|
If IsNumeric(aFrom) Then
|
|
XTypeConverter_convertToSimpleType = CStr(aFrom)
|
|
Else
|
|
XTypeConverter_convertToSimpleType = "Wrong input type: " & TypeName(aFrom)
|
|
End If
|
|
End Function
|