diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-07 03:27:18 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-05-07 21:48:14 +0200 |
| commit | 864fc92a5644ea56cd0fd3dec4e40601b828b31c (patch) | |
| tree | 5828ee71daa4d05da245c9361d99840dda78f367 | |
| parent | 009776a16410024a9437847af065d2160b434f30 (diff) | |
string result of formula is also valid, fdo#49052
Change-Id: I I0beb439381a0d01b27d219b148c47839055b6f62
(cherry picked from commit c0ca1ef1990226cd5d7af6c1f76872e9ad8711f2)
Signed-off-by: Eike Rathke <erack@redhat.com>
Backported to use the older void ScFormulaCell::GetString(String&)
| -rw-r--r-- | sc/source/core/data/dociter.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 0b466c0db17e..1ab2b4376c81 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -616,8 +616,16 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode(); return sal_True; // gefunden } - else + else if(mpParam->mbSkipString) nRow++; + else + { + static_cast<ScFormulaCell*>(pCell)->GetString( rValue.maString); + rValue.mfValue = 0.0; + rValue.mnError = static_cast<ScFormulaCell*>(pCell)->GetErrCode(); + rValue.mbIsNumber = false; + return true; + } } break; case CELLTYPE_STRING: |