sc/source/core/data/dociter.cxx | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit c0ca1ef1990226cd5d7af6c1f76872e9ad8711f2
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon May 7 05:27:18 2012 +0200
string result of formula is also valid, fdo#49052
Change-Id: I I0beb439381a0d01b27d219b148c47839055b6f62
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f2a9633..92c7cbd 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
