[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Luboš Luňák]

 sc/source/core/tool/interpr1.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1fcd620eeb0bdc37d110b37e18fe73c144f26d43
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Tue Jun 26 16:08:41 2018 +0200

    use ScInterpreterContext in ScMin()
    
    Otherwise fdo#74583-1 asserts with calc's threading.
    
    Change-Id: I2ba46a15d1d5216b279ae21d92ae52353e470df6
    Reviewed-on: https://gerrit.libreoffice.org/56479
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit ceabe204a7547988df8851e5d807ec83105e190c)
    Reviewed-on: https://gerrit.libreoffice.org/56515

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index d4bd096e7fe9..dd1aaca90d53 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3561,6 +3561,7 @@ void ScInterpreter::ScMin( bool bTextAsZero )
                 FormulaError nErr = FormulaError::NONE;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 ScValueIterator aValIter( pDok, aRange, mnSubTotalFlags, bTextAsZero );
+                aValIter.SetInterpreterContext( &mrContext );
                 if (aValIter.GetFirst(nVal, nErr))
                 {
                     if (nMin > nVal)
@@ -3718,6 +3719,7 @@ void ScInterpreter::ScMax( bool bTextAsZero )
                 FormulaError nErr = FormulaError::NONE;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 ScValueIterator aValIter( pDok, aRange, mnSubTotalFlags, bTextAsZero );
+                aValIter.SetInterpreterContext( &mrContext );
                 if (aValIter.GetFirst(nVal, nErr))
                 {
                     if (nMax < nVal)