From c0ca1ef1990226cd5d7af6c1f76872e9ad8711f2 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 7 May 2012 05:27:18 +0200 Subject: [PATCH] string result of formula is also valid, fdo#49052 Change-Id: I I0beb439381a0d01b27d219b148c47839055b6f62 --- sc/source/core/data/dociter.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index f2a96338a553..92c7cbd2bfef 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -615,8 +615,16 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode(); return true; // gefunden } - else + else if(mpParam->mbSkipString) nRow++; + else + { + rValue.maString = static_cast(pCell)->GetString(); + rValue.mfValue = 0.0; + rValue.mnError = static_cast(pCell)->GetErrCode(); + rValue.mbIsNumber = false; + return true; + } } break; case CELLTYPE_STRING: