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

[Eike Rathke]

 sc/source/core/data/grouptokenconverter.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 0443eb8bf5ed79d13ec1aa49ac83ed2b2e8eea54
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Dec 16 22:52:09 2017 +0100

    Type svIndex does not necessarily mean range name, tdf#114251 related
    
    Change-Id: I5e7930b7f93ee44fb0d6b4c86f261afde8ed2ccc
    Reviewed-on: https://gerrit.libreoffice.org/46615
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit ecac94f3a6872538c19827603b52f1ed7e671a4c)
    Reviewed-on: https://gerrit.libreoffice.org/46668
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/grouptokenconverter.cxx b/sc/source/core/data/grouptokenconverter.cxx
index 8132c1c400f1..410e3662ae78 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -241,6 +241,13 @@ bool ScGroupTokenConverter::convert( ScTokenArray& rCode, sc::FormulaLogger::Gro
             break;
             case svIndex:
             {
+                if (p->GetOpCode() != ocName)
+                {
+                    // May be DB-range or TableRef
+                    mrGroupTokens.AddToken(*p);
+                    break;
+                }
+
                 // Named range.
                 ScRangeName* pNames = mrDoc.GetRangeName();
                 if (!pNames)