fixx

1 files changed, 3 insertions, 1 deletions

diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 81148d9..7281003 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -22,24 +22,25 @@
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qregexp.h>
 #include <qtextstream.h>
+#include <qtextcodec.h>
 
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 
 #include "csvimportdialog.h"
@@ -142,24 +143,25 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
 KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const
 {
   CSVImportDialog dlg( addressBook(), parentWidget() );
   if ( dlg.exec() )
     return dlg.contacts();
   else
     return KABC::AddresseeList();
 }
 
 void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
 {
   QTextStream t( fp );
+  t.setCodec( QTextCodec::codecForName("utf8") );
 
   KABC::AddresseeList::ConstIterator iter;
   KABC::Field::List fields = addressBook()->fields();
   KABC::Field::List::Iterator fieldIter;
   bool first = true;
 
   // First output the column headings
   for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
     if ( !first )
       t << ",";
 
     t << "\"" << (*fieldIter)->label() << "\"";
@@ -168,25 +170,25 @@ void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
   t << "\n";
 
   // Then all the addressee objects
   KABC::Addressee addr;
   for ( iter = list.begin(); iter != list.end(); ++iter ) {
     addr = *iter;
     first = true;
 
     for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
       if ( !first )
         t << ",";
 
-      t << "\"" << (*fieldIter)->value( addr ).replace( QRegExp("\n"), "\\n" ) << "\"";
+      t << "\"" << (*fieldIter)->value( addr ) << "\"";
       first = false;
     }
 
     t << "\n";
   }
 }
 
 #ifndef KAB_EMBEDDED
 #include "csv_xxport.moc"
 #endif //KAB_EMBEDDED