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

List:       kde-commits
Subject:    koffice/filters/kspread/csv
From:       Norbert Andres <nandres () web ! de>
Date:       2003-02-28 21:24:49
[Download RAW message or body]

CVS commit by nandres: 

- fixes bug #55116 (normal): wrong currency & date assignment


  M +2 -2      csvdialog.cpp   1.16
  M +17 -10    csvimport.cc   1.23


--- koffice/filters/kspread/csv/csvdialog.cpp  #1.15:1.16
@@ -429,8 +429,8 @@ void CSVDialog::formatClicked(int id)
         header = i18n("Number");
         break;
-    case 3: // date
+    case 2: // date
         header = i18n("Date");
         break;
-    case 2: // currency
+    case 3: // currency
         header = i18n("Currency");
         break;

--- koffice/filters/kspread/csv/csvimport.cc  #1.22:1.23
@@ -134,6 +134,4 @@ KoFilter::ConversionStatus CSVFilter::co
             emit sigProgress(value);
             QString text( dialog->getText( row, col ) );
-            table->setText( row + 1, col + 1, text, false, true );
-            cell = table->cellAt( col + 1, row + 1, false );
 
             double len = (double) text.length() * width;
@@ -144,14 +142,23 @@ KoFilter::ConversionStatus CSVFilter::co
             {
              case CSVDialog::TEXT:
+              table->setText( row + 1, col + 1, text, false, true );
+              cell = table->cellAt( col + 1, row + 1, false );
                 break;
              case CSVDialog::NUMBER:
+              table->setText( row + 1, col + 1, text, false );
+              cell = table->cellAt( col + 1, row + 1, false );
                 cell->setFormatType(KSpreadCell::Number);
                 cell->setPrecision(2);
                 break;
              case CSVDialog::DATE:
+              table->setText( row + 1, col + 1, text, false );
+              cell = table->cellAt( col + 1, row + 1, false );
                 cell->setFormatType(KSpreadCell::ShortDate);
                 break;
              case CSVDialog::CURRENCY:
+              table->setText( row + 1, col + 1, text, false );
+              cell = table->cellAt( col + 1, row + 1, false );
                 cell->setFormatType(KSpreadCell::Money);
+              cell->setPrecision(2);
                 break;
             }


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