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

[Eike Rathke]

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

New commits:
commit 2a45464d7c9ee9c7bb5af2bc26dcd9a99bb53ef8
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Mar 10 18:32:27 2017 +0100

    Resolves: tdf#106459 3D reference can't be handled as vector reference
    
    Change-Id: Icba12a6218086079a7d5538f7263bccb1f2ee1b0
    (cherry picked from commit ca1f051972946b24cb6658143fb0d0ac3587a988)
    Reviewed-on: https://gerrit.libreoffice.org/35052
    Tested-by: Jenkins <ci at libreoffice.org>
    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 22b89a6..1ec49e4 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -164,6 +164,10 @@ bool ScGroupTokenConverter::convert(ScTokenArray& rCode)
                 ScComplexRefData aRef = *p->GetDoubleRef();
                 ScRange aAbs = aRef.toAbs(mrPos);
 
+                // Multiple sheets not handled by vector/matrix.
+                if (aRef.Ref1.Tab() != aRef.Ref2.Tab())
+                    return false;
+
                 // Check for self reference.
                 if (aRef.Ref1.IsRowRel())
                 {