commit 53dcc323db200ba440f5cdb054bce8bd126b4185
author Eike Rathke <erack@redhat.com> Wed Feb 11 23:44:00 2015 +0100
committer Katarina Behrens <Katarina.Behrens@cib.de> Wed May 17 15:34:56 2017 +0200
tree a2c11693577b3050e3f459ed1366b2775b0d26dd
parent 0f420e946b48cb5fea0302f6fbfbded3f6d50560

Resolves: tdf#39316 add matrix empty cells to ScInterpreter::QueryMatrixType()

(only partial cherry-pick, ScMatrix::IsEmptyResult needs newer mdds)
(cherry picked from commit eccbc97c7c224269fe261b8924e7866c3758ec91)

Change-Id: Ifa5d59e90afcfff66f2e8683fac2a9090ed615da

sc/source/core/tool/interpr4.cxx

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 7d7e5b9..2995a6e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1849,6 +1849,11 @@
                 PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
                 rRetTypeExpr = NUMBERFORMAT_LOGICAL;
             }
+            else if ( xMat->IsEmpty( 0, 0))
+            {   // empty or empty cell
+                FormulaTokenRef xRes = new ScEmptyCellToken( false, true);  // not inherited, display empty
+                PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
+            }
             else
             {
                 String aStr( nMatVal.GetString());