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

List:       kde-commits
Subject:    koffice/filters/kspread/csv
From:       Laurent Montel <montel () kde ! org>
Date:       2006-09-16 13:41:52
Message-ID: 1158414112.032399.11082.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 585187 by mlaurent:

Compile++


 M  +5 -5      csvexport.cc  
 M  +2 -1      csvexport.h  


--- trunk/koffice/filters/kspread/csv/csvexport.cc #585186:585187
@@ -68,7 +68,7 @@
 {
 }
 
-QString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row, QChar \
const & textQuote ) +QString CSVExport::exportCSVCell( const KSpread::Doc* doc, Sheet \
const * const sheet, int col, int row, QChar const & textQuote )  {
   // This function, given a cell, returns a string corresponding to its export in \
CSV format  // It proceeds by:
@@ -86,9 +86,9 @@
     else if ( !cell->link().isEmpty() )
         text = cell->text(); // untested
     else if( cell->isTime() )
-        text = cell->value().asTime().toString("hh:mm:ss");
+        text = cell->value().asTime(doc).toString("hh:mm:ss");
     else if( cell->isDate() )
-        text = cell->value().asDate().toString("yyyy-MM-dd");
+        text = cell->value().asDate(doc).toString("yyyy-MM-dd");
     else
         text = cell->strOutText();
   }
@@ -233,7 +233,7 @@
       for ( int col = selection.left();
             col <= right && idxCol <= CSVMaxCol; ++col, ++idxCol )
       {
-        str += exportCSVCell( sheet, col, row, textQuote );
+        str += exportCSVCell( ksdoc, sheet, col, row, textQuote );
 
         if ( idxCol < CSVMaxCol )
           str += csvDelimiter;
@@ -327,7 +327,7 @@
 
         for ( int col = 1 ; col <= CSVMaxCol ; col++ )
         {
-          str += exportCSVCell( sheet, col, row, textQuote );
+          str += exportCSVCell( ksdoc,sheet, col, row, textQuote );
 
           if ( col < CSVMaxCol )
             str += csvDelimiter;
--- trunk/koffice/filters/kspread/csv/csvexport.h #585186:585187
@@ -29,6 +29,7 @@
 namespace KSpread
 {
 class Sheet;
+class Doc;
 }
 
 class CSVExport : public KoFilter
@@ -42,7 +43,7 @@
   virtual KoFilter::ConversionStatus convert( const QByteArray & from, const \
QByteArray & to );  
   private:
-  QString exportCSVCell( KSpread::Sheet const * const sheet, int col, int row, QChar \
const & textQuote ); +  QString exportCSVCell( const KSpread::Doc* doc,KSpread::Sheet \
const * const sheet, int col, int row, QChar const & textQuote );  
   private:
   QString m_eol; ///< End of line (LF, CR or CRLF)


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