forked from amazingfate/loongoffice
fa8a0f514a
In commit f3f46b5fe729876d128f63f7ab158954ab6657d7 (tdf#132064: make With statement only evaluate its argument once, 2024-08-17), I made a mistake, clearing the internal variable in the end of SbiParser::With using an Erase call, which does not just clears the variable itself, but destroys the underlying object, which is not what we need. I don't know how to refer to a global Nothing object to assign to the variable; so just create an own internal Nothing, and use it in the assignment. Change-Id: Ic8ce52e0402d8461a9b9e4ee07614c4f0a46a95e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172006 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
61 lines
1.7 KiB
QBasic
61 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
|
|
test_with
|
|
doUnitTest = TestUtil.GetResult()
|
|
End Function
|
|
|
|
Sub DEV_TST : MsgBox doUnitTesT : End Sub
|
|
|
|
Type foo
|
|
n As Integer
|
|
s As String
|
|
End Type
|
|
|
|
Dim get_foo_count As Integer
|
|
|
|
Function get_foo As foo
|
|
get_foo_count = get_foo_count + 1
|
|
get_foo = New foo
|
|
End Function
|
|
|
|
Sub test_with
|
|
On Error GoTo errorHandler
|
|
|
|
Dim fields As String
|
|
With get_foo()
|
|
.n = 5
|
|
.s = "bar"
|
|
fields = "n = " & .n & " s = " & .s
|
|
End With
|
|
' get_foo must be called only once; before the fix, it failed with
|
|
' Number of calls to get_foo returned 4, expected 1
|
|
TestUtil.AssertEqual(get_foo_count, 1, "Number of calls to get_foo")
|
|
' Before the fix, each use of . resulted in creation of a new 'foo' object,
|
|
' and previous assignments didn't reflect in the result; it failed with
|
|
' Field values returned n = 0 s = , expected n = 5 s = bar
|
|
TestUtil.AssertEqual(fields, "n = 5 s = bar", "Field values")
|
|
|
|
' Make sure that With works with the original object, modifies it, and does not destroy
|
|
Dim foo_var As New foo
|
|
With foo_var
|
|
.n = 6
|
|
.s = "baz"
|
|
End With
|
|
fields = "n = " & foo_var.n & " s = " & foo_var.s
|
|
TestUtil.AssertEqual(fields, "n = 6 s = baz", "Field values of foo_var")
|
|
|
|
Exit Sub
|
|
errorHandler:
|
|
TestUtil.ReportErrorHandler("test_with", Err, Error$, Erl)
|
|
End Sub
|