summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-05-07 05:27:18 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-05-07 05:28:41 +0200
commitc0ca1ef1990226cd5d7af6c1f76872e9ad8711f2 (patch)
tree52f3feba55f4f15de96215afa4a376edfc529857
parentee34a78b175765a1444071217239f3592c16eec1 (diff)
string result of formula is also valid, fdo#49052
Change-Id: I I0beb439381a0d01b27d219b148c47839055b6f62
-rw-r--r--sc/source/core/data/dociter.cxx10
1 files changed, 9 insertions, 1 deletions
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<ScFormulaCell*>(pCell)->GetString();
+ rValue.mfValue = 0.0;
+ rValue.mnError = static_cast<ScFormulaCell*>(pCell)->GetErrCode();
+ rValue.mbIsNumber = false;
+ return true;
+ }
}
break;
case CELLTYPE_STRING: