1 files changed, 6 insertions, 4 deletions

diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp
index 103b83b..e1e4744 100644
--- a/noncore/apps/opie-sheet/sheet.cpp
+++ b/noncore/apps/opie-sheet/sheet.cpp
@@ -910,5 +910,5 @@ double Sheet::functionCountIf(const QString &param1, const QString &param2, cons
 
 
-QString Sheet::calculateFunction(const QString &function, const QString &parameters, int NumOfParams)
+QString Sheet::calculateFunction(const QString &func, const QString &parameters, int NumOfParams)
 {
   bool ok;
@@ -919,4 +919,6 @@ QString Sheet::calculateFunction(const QString &function, const QString &paramet
   QString s1,s2;
 //basic functions
+  QString function;
+  function=func.upper();
   if (function=="+")
   {
@@ -1778,5 +1780,5 @@ QString Sheet::dataParserHelper(const QString &data)
                 else if(tokentype==VARIABLE_TOKEN)
                 {
-                        stack1.push(new QString(*s1));
+                        stack1.push(new QString(QString(*s1).upper()));
                         //printf("Parse:Var=%s\r\n",s1->latin1());
                         //here to put implementation of other types of variables except cell.
@@ -1802,5 +1804,5 @@ QString Sheet::dataParserHelper(const QString &data)
                                         //,s1->latin1(),params.latin1(),stack1.count(),args);
                                 tempval=calculateFunction(*s1,params,args);
-                                tempval=tempval.upper();
+                                tempval=tempval;
                                 stack1.push(new QString(tempval));
                 };
@@ -1826,5 +1828,5 @@ QString Sheet::dataParser(const QString &cell, const QString &data)
   listDataParser.append(cell);
  // printf("DATAPARSER: data=%s, cell=%s\r\n",data.ascii(),cell.ascii());
-  strippedData=dataParserHelper(strippedData.remove(0, 1).upper().replace(QRegExp(":"), ","));
+  strippedData=dataParserHelper(strippedData.remove(0, 1).replace(QRegExp(":"), ","));
 
   int i=0;