[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Bartosz Kosiorek]

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

New commits:
commit e392f847bff0321d7884daabe74d91d90f07a0bf
Author: Bartosz Kosiorek <gang65 at poczta.onet.pl>
Date:   Tue Feb 6 00:45:32 2018 +0100

    tdf#114820 Fix reading external reference for VLOOKUP and HLOOKUP
    
    Change-Id: Iaa1307123d97a740bdaf90647e8adff224211851
    Reviewed-on: https://gerrit.libreoffice.org/49263
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 5c3d0a70a0edb182714725ef920d74667feffb0e)
    Reviewed-on: https://gerrit.libreoffice.org/49316

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 53122e82cb40..f40637f33540 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6634,7 +6634,9 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry)
             }
         }
         break;
-        case svMatrix :
+        case svExternalDoubleRef:
+        case svExternalSingleRef:
+        case svMatrix:
         {
             svl::SharedString aStr;
             const ScMatValType nType = GetDoubleOrStringFromMatrix(rItem.mfVal, aStr);
@@ -6651,6 +6653,7 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry)
     } // switch ( GetStackType() )
     return true;
 }
+
 void ScInterpreter::ScVLookup()
 {
     CalculateLookup(false);