summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-02-11 23:44:00 +0100
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-05-17 15:34:56 +0200
commit53dcc323db200ba440f5cdb054bce8bd126b4185 (patch)
treea2c11693577b3050e3f459ed1366b2775b0d26dd
parenttdf#35636: Apply algorithm also to ranges spanning multiple columns (diff)
downloadcore-feature/cib_contract138.tar.gz
core-feature/cib_contract138.zip
Resolves: tdf#39316 add matrix empty cells to ScInterpreter::QueryMatrixType() feature/cib_contract138
(only partial cherry-pick, ScMatrix::IsEmptyResult needs newer mdds) (cherry picked from commit eccbc97c7c224269fe261b8924e7866c3758ec91) Change-Id: Ifa5d59e90afcfff66f2e8683fac2a9090ed615da
-rw-r--r--sc/source/core/tool/interpr4.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 7d7e5b9575c2..2995a6e18c65 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1849,6 +1849,11 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, sal_
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());