[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Eike Rathke]

 sc/source/core/data/dociter.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 864fc92a5644ea56cd0fd3dec4e40601b828b31c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon May 7 03:27:18 2012 +0200

    string result of formula is also valid, fdo#49052
    
    Change-Id: I I0beb439381a0d01b27d219b148c47839055b6f62
    (cherry picked from commit c0ca1ef1990226cd5d7af6c1f76872e9ad8711f2)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>
    
    Backported to use the older void ScFormulaCell::GetString(String&)

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 0b466c0..1ab2b43 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: