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

[Eike Rathke]

 sc/source/core/tool/interpr1.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f7247d66b3376b37da403acd74ee49f59b8b18a5
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Mar 2 21:38:08 2018 +0100

    Resolves: tdf#116149 handle external references in VAR* and STDEV* functions
    
    Change-Id: I644a5f8f92452ca775ee3b42a73d3f0a0ac3c623
    (cherry picked from commit 38b87bbb24c1d1cc088d3d135e7e95b3ec75d386)
    Reviewed-on: https://gerrit.libreoffice.org/50647
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index ca588b6a9f03..18a93676fa4a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3932,9 +3932,11 @@ void ScInterpreter::GetStVarParams( bool bTextAsZero, double(*VarResult)( double
                 }
             }
             break;
+            case svExternalSingleRef :
+            case svExternalDoubleRef :
             case svMatrix :
             {
-                ScMatrixRef pMat = PopMatrix();
+                ScMatrixRef pMat = GetMatrix();
                 if (pMat)
                 {
                     SCSIZE nC, nR;