commit cb97358ab845f13f1c57b410e59126f20652d552
author Andreas Heinisch <andreas.heinisch@yahoo.de> Mon Aug 02 19:48:35 2021 +0200
committer Xisco Fauli <xiscofauli@libreoffice.org> Mon Aug 09 17:36:57 2021 +0200
tree a3c0e00c070e7197bf59ae45a60e55ace7781bd2
parent 6b393b6cc65992ba6af4476024bb2f26518c388b

tdf#143582 - Clear return value of the method before calling it

Otherwise the function keeps a copy of its return value, which may be
used in an upcoming call.

Change-Id: I4977c39e1ce48cfd5ab067a4df4783f10505a9ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119905
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120197

sc/qa/extras/macros-test.cxx

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index fae1e4f..68d43e1 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -59,6 +59,7 @@ public:
    void testTdf138646();
    void testTdf105558();
    void testTdf90278();
    void testTdf143582();

    CPPUNIT_TEST_SUITE(ScMacrosTest);
    CPPUNIT_TEST(testStarBasic);
@@ -84,6 +85,7 @@ public:
    CPPUNIT_TEST(testTdf138646);
    CPPUNIT_TEST(testTdf105558);
    CPPUNIT_TEST(testTdf90278);
    CPPUNIT_TEST(testTdf143582);

    CPPUNIT_TEST_SUITE_END();
};
@@ -950,6 +952,34 @@ void ScMacrosTest::testTdf133889()
    xCloseable->close(true);
}

void ScMacrosTest::testTdf143582()
{
    OUString aFileName;
    createFileURL(u"tdf143582.ods", aFileName);
    auto xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");

    css::uno::Any aRet;
    css::uno::Sequence<css::uno::Any> aParams;
    css::uno::Sequence<css::uno::Any> aOutParam;
    css::uno::Sequence<sal_Int16> aOutParamIndex;

    SfxObjectShell::CallXScript(
        xComponent,
        "vnd.sun.Star.script:Standard.Module1.TestScriptInvoke?language=Basic&location=document",
        aParams, aRet, aOutParamIndex, aOutParam);

    OUString aReturnValue;
    aRet >>= aReturnValue;

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

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

void ScMacrosTest::testTdf138646()
{
    OUString aFileName;

sc/qa/extras/testdocuments/tdf143582.ods

diff --git a/sc/qa/extras/testdocuments/tdf143582.ods b/sc/qa/extras/testdocuments/tdf143582.ods
new file mode 100644
index 0000000..05f4f07
--- /dev/null
+++ 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 a22cd82..6a9a8d1 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -244,6 +244,8 @@ namespace basprov
            if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
                aOldThisComponent = m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( m_xDocumentScriptContext ) );

            // tdf#143582 - clear return value of the method before calling it
            m_xMethod->Clear();
            if ( m_caller.hasElements() && m_caller[ 0 ].hasValue()  )
            {
                SbxVariableRef xCallerVar = new SbxVariable( SbxVARIANT );