From 3cb4363abdb17d2898b4792390672375ffcd2493 Mon Sep 17 00:00:00 2001
From: hayzel <hayzel>
Date: Thu, 08 Jan 2004 12:12:30 +0000
Subject: *** empty log message ***

---
(limited to 'noncore')

diff --git a/noncore/apps/opie-sheet/ChangeLog b/noncore/apps/opie-sheet/ChangeLog
index 56887c5..e8a31ee 100644
--- a/noncore/apps/opie-sheet/ChangeLog
+++ b/noncore/apps/opie-sheet/ChangeLog
@@ -1,3 +1,7 @@
+January 8, 2004
+	- fixed issue : "-if someone enters directly text as parameter to a string function the text renders as uppercase due to the calculation engine that uppercases all the parsing sentence."
+	now the text is handled correctly.
+
 January 7, 2004
 	* Release by hayzel (koppermind@panafonet.gr)
 	This version has many valuable changes, though It may have some annoying bugs. Please if you are interested in opie-sheet try it hard, so I can fix some of them. Also If you want some other functions that must be here and are missing feel free to ask them. (no financial functions please. :)  I really hate them )
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
@@ -909,7 +909,7 @@ 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;
   double val1=0.0,val2=0.0,val3=0.0;
@@ -918,6 +918,8 @@ QString Sheet::calculateFunction(const QString &function, const QString &paramet
   int row,col;
   QString s1,s2;
 //basic functions
+  QString function;
+  function=func.upper();
   if (function=="+")
   {
     s1=calculateVariable(getParameter(parameters, 0));
@@ -1777,7 +1779,7 @@ 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.
 			//for example names
@@ -1801,7 +1803,7 @@ QString Sheet::dataParserHelper(const QString &data)
 				//printf("Parse:Func=%s, params=%s, stackcount=%d,args=%d\r\n"
 				//	,s1->latin1(),params.latin1(),stack1.count(),args);
 				tempval=calculateFunction(*s1,params,args);
-				tempval=tempval.upper();
+				tempval=tempval;
 				stack1.push(new QString(tempval));
 		};
 
@@ -1825,7 +1827,7 @@ QString Sheet::dataParser(const QString &cell, const QString &data)
   if (listDataParser.find(cell)!=listDataParser.end()) return "0";
   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;
   QString tempParameter(getParameter(strippedData, i)), result="";
diff --git a/noncore/apps/opie-sheet/sheet.h b/noncore/apps/opie-sheet/sheet.h
index 41f1b86..f705cd0 100644
--- a/noncore/apps/opie-sheet/sheet.h
+++ b/noncore/apps/opie-sheet/sheet.h
@@ -100,7 +100,7 @@ class Sheet: public QTable
   QString findCellName(int row, int col);
   bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2);
   QString calculateVariable(const QString &variable);
-  QString calculateFunction(const QString &function, const QString &parameters, int NumOfParams);
+  QString calculateFunction(const QString &func, const QString &parameters, int NumOfParams);
   QString getParameter(const QString &parameters, int paramNo, bool giveError=FALSE, const QString funcName="");
   QString dataParser(const QString &cell, const QString &data);
   QString dataParserHelper(const QString &data);
--
cgit v0.9.0.2