[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/kspread/opencalc
From:       Bram Schoenmakers <bramschoenmakers () kde ! nl>
Date:       2005-04-20 17:12:06
Message-ID: 20050420171206.8F52A66B () office ! kde ! org
[Download RAW message or body]

CVS commit by bram: 

Replace '%' in formula by /100, resolves parse error. Fixes half of 101217.

CCBUGS:101217


  M +8 -3      opencalcimport.cc   1.65


--- koffice/filters/kspread/opencalc/opencalcimport.cc  #1.64:1.65
@@ -296,10 +296,8 @@ void OpenCalcImport::convertFormula( QSt
   while ( p < l )
   {
-    if ( f[p] == '(' )
+    if ( f[p] == '(' || f[p] == '[' )
     {
       break;
     }
-    else if ( f[p] == '[' )
-      break;
 
     formula += f[p];
@@ -360,4 +358,11 @@ void OpenCalcImport::convertFormula( QSt
         parameter += "==";
     }
+    else if ( f[p] == '%' )
+    {
+      if( inQuote )
+        parameter += '%';
+      else
+        parameter += "/100";
+    }
     else if ( f[p] == ')' )
     {


[prev in list] [next in list] [prev in thread] [next in thread]