commit 29ec800034211194f9e2ab1748e0b6a1011dcf3f
author Mike Kaganski <mike.kaganski@collabora.com> Wed Dec 22 14:55:01 2021 +0300
committer Xisco Fauli <xiscofauli@libreoffice.org> Thu Dec 23 21:30:24 2021 +0100
tree e2c8609cbe20e18aea0868eb16f43d8bf8b08189
parent d5c8e1e0ddda213b3d4d64510259dba45315518e

tdf#143582: Avoid error on clearing leftover return value of a method

SbxValue::Clear happens to not error out on clearing string and some
other types of objects, but for the rest, it calls SbxValue::Put, and
the latter errors out if not CanWrite(). The original test implemented
in commit 24d24debef4cda7de702c4b470a3707f1aae3ea3 only checked string
return value, so happened to miss this problem.

See similar code in SbiRuntime::FindElement.

Change-Id: I7c17137cc9e7ee3133ee86a9f701559df66e53b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127248
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 822998f1dc202aba7a558767f641687aef0c1148)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127257
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

sc/qa/extras/macros-test.cxx

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index a68b39c..b18bb7a 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -1061,9 +1061,9 @@ void ScMacrosTest::testTdf143582()
    aRet >>= aReturnValue;

    // Without the fix in place, this test would have failed with
    // - Expected: Test
    // - Actual  : TeTest
    CPPUNIT_ASSERT_EQUAL(OUString("Test"), aReturnValue);
    // - Expected: Test6
    // - Actual  : TeTest8
    CPPUNIT_ASSERT_EQUAL(OUString("Test6"), aReturnValue);

    css::uno::Reference<css::util::XCloseable> xCloseable(xComponent, css::uno::UNO_QUERY_THROW);
    xCloseable->close(true);

sc/qa/extras/testdocuments/tdf143582.ods

diff --git a/sc/qa/extras/testdocuments/tdf143582.ods b/sc/qa/extras/testdocuments/tdf143582.ods
index 05f4f07..1375bf5 100644
--- a/sc/qa/extras/testdocuments/tdf143582.ods
+++ b/sc/qa/extras/testdocuments/tdf143582.ods
Binary files differ

scripting/source/basprov/basscript.cxx

diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 0b411c8..2cc67d4 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -245,7 +245,10 @@ constexpr OUStringLiteral BASSCRIPT_PROPERTY_CALLER = u"Caller";
                aOldThisComponent = m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( m_xDocumentScriptContext ) );

            // tdf#143582 - clear return value of the method before calling it
            const SbxFlagBits nSavFlags = m_xMethod->GetFlags();
            m_xMethod->SetFlag(SbxFlagBits::ReadWrite | SbxFlagBits::NoBroadcast);
            m_xMethod->Clear();
            m_xMethod->SetFlags(nSavFlags);
            if ( m_caller.hasElements() && m_caller[ 0 ].hasValue()  )
            {
                SbxVariableRef xCallerVar = new SbxVariable( SbxVARIANT );