string result of formula is also valid, fdo#49052

Change-Id: I I0beb439381a0d01b27d219b148c47839055b6f62
2012-05-07 05:27:18 +02:00
parent ee34a78b17
commit c0ca1ef199
1 changed files with 9 additions and 1 deletions
--- 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: