[Libreoffice-commits] core.git: sc/source

[Winfried Donkers]

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

New commits:
commit 04f1d35e7eda2c3b178649610d609ee99342bf41
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Tue Jan 10 16:30:14 2017 +0100

    tdf#105238 : return error when SHEETS argument is not a reference.
    
    Change-Id: I9c93762b6bfe800d4843070fece2834d544cea13
    Reviewed-on: https://gerrit.libreoffice.org/32932
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 7fe7b81..d9d0658 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3925,11 +3925,12 @@ void ScInterpreter::ScSheets()
         SCCOL nCol2;
         SCROW nRow2;
         SCTAB nTab2;
-        while (nParamCount-- > 0)
+        while (nGlobalError == FormulaError::NONE && nParamCount-- > 0)
         {
             switch ( GetStackType() )
             {
                 case svSingleRef:
+                case svExternalSingleRef:
                     PopError();
                     nVal++;
                 break;
@@ -3937,14 +3938,6 @@ void ScInterpreter::ScSheets()
                     PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
                     nVal += static_cast<sal_uLong>(nTab2 - nTab1 + 1);
                 break;
-                case svMatrix:
-                    PopError();
-                    nVal++;
-                break;
-                case svExternalSingleRef:
-                    PopError();
-                    nVal++;
-                break;
                 case svExternalDoubleRef:
                 {
                     sal_uInt16 nFileId;