[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-2' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column2.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 7212c44103d8bd98b1152e45ac8fa27ce0a94c15
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Sep 5 20:29:18 2013 -0400

    Handle string or edit cells when resolving static reference for group calc.
    
    Change-Id: Ifb2d0d6e7c9f3040bca61b5bdce14d853058d954

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5c5e28a..2098921 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1849,6 +1849,17 @@ formula::FormulaTokenRef ScColumn::ResolveStaticReference( SCROW nRow )
 
             return formula::FormulaTokenRef(new formula::FormulaStringToken(p->GetString()));
         }
+        case sc::element_type_string:
+        {
+            OUString aStr = sc::string_block::at(*it->data, aPos.second);
+            return formula::FormulaTokenRef(new formula::FormulaStringToken(aStr));
+        }
+        case sc::element_type_edittext:
+        {
+            const EditTextObject* pText = sc::edittext_block::at(*it->data, aPos.second);
+            OUString aStr = ScEditUtil::GetString(*pText, pDocument);
+            return formula::FormulaTokenRef(new formula::FormulaStringToken(aStr));
+        }
         case sc::element_type_empty:
         default:
             // Return a value of 0.0 in all the other cases.