author | hayzel <hayzel> | 2004-01-08 12:12:30 (UTC) |
---|---|---|
committer | hayzel <hayzel> | 2004-01-08 12:12:30 (UTC) |
commit | 3cb4363abdb17d2898b4792390672375ffcd2493 (patch) (unidiff) | |
tree | a4debe153e781bb76a87b42362215800c81704d4 | |
parent | b25818faa882c1eb040f74e485cd981b94871a61 (diff) | |
download | opie-3cb4363abdb17d2898b4792390672375ffcd2493.zip opie-3cb4363abdb17d2898b4792390672375ffcd2493.tar.gz opie-3cb4363abdb17d2898b4792390672375ffcd2493.tar.bz2 |
*** empty log message ***
-rw-r--r-- | noncore/apps/opie-sheet/ChangeLog | 4 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.h | 2 |
3 files changed, 11 insertions, 5 deletions
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 +1,5 @@ | |||
1 | January 8, 2004 | ||
2 | - 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." | ||
3 | now the text is handled correctly. | ||
4 | |||
1 | January 7, 2004 | 5 | January 7, 2004 |
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 | |||
@@ -911,3 +911,3 @@ double Sheet::functionCountIf(const QString ¶m1, const QString ¶m2, cons | |||
911 | 911 | ||
912 | QString Sheet::calculateFunction(const QString &function, const QString ¶meters, int NumOfParams) | 912 | QString Sheet::calculateFunction(const QString &func, const QString ¶meters, int NumOfParams) |
913 | { | 913 | { |
@@ -920,2 +920,4 @@ QString Sheet::calculateFunction(const QString &function, const QString ¶met | |||
920 | //basic functions | 920 | //basic functions |
921 | QString function; | ||
922 | function=func.upper(); | ||
921 | if (function=="+") | 923 | if (function=="+") |
@@ -1779,3 +1781,3 @@ QString Sheet::dataParserHelper(const QString &data) | |||
1779 | { | 1781 | { |
1780 | stack1.push(new QString(*s1)); | 1782 | stack1.push(new QString(QString(*s1).upper())); |
1781 | //printf("Parse:Var=%s\r\n",s1->latin1()); | 1783 | //printf("Parse:Var=%s\r\n",s1->latin1()); |
@@ -1803,3 +1805,3 @@ QString Sheet::dataParserHelper(const QString &data) | |||
1803 | tempval=calculateFunction(*s1,params,args); | 1805 | tempval=calculateFunction(*s1,params,args); |
1804 | tempval=tempval.upper(); | 1806 | tempval=tempval; |
1805 | stack1.push(new QString(tempval)); | 1807 | stack1.push(new QString(tempval)); |
@@ -1827,3 +1829,3 @@ QString Sheet::dataParser(const QString &cell, const QString &data) | |||
1827 | // printf("DATAPARSER: data=%s, cell=%s\r\n",data.ascii(),cell.ascii()); | 1829 | // printf("DATAPARSER: data=%s, cell=%s\r\n",data.ascii(),cell.ascii()); |
1828 | strippedData=dataParserHelper(strippedData.remove(0, 1).upper().replace(QRegExp(":"), ",")); | 1830 | strippedData=dataParserHelper(strippedData.remove(0, 1).replace(QRegExp(":"), ",")); |
1829 | 1831 | ||
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 | |||
@@ -102,3 +102,3 @@ class Sheet: public QTable | |||
102 | QString calculateVariable(const QString &variable); | 102 | QString calculateVariable(const QString &variable); |
103 | QString calculateFunction(const QString &function, const QString ¶meters, int NumOfParams); | 103 | QString calculateFunction(const QString &func, const QString ¶meters, int NumOfParams); |
104 | QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); | 104 | QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); |