From bdaded2da25b0ccef80d6e638fa12f92a4f8744d Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 29 Apr 2005 12:18:46 +0000
Subject: another csv import fix

---
(limited to 'kaddressbook/xxport')

diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 41e2612..4044fa8 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -358,7 +358,7 @@ KABC::AddresseeList CSVImportDialog::contacts() const
             if ( counter == (int)( posToType( item->currentItem() ) - mCustomCounter ) ) 
             {
               (*it)->setValue( a, value );
-              continue;
+              break;
             }
             ++counter;
           }
@@ -541,7 +541,7 @@ void CSVImportDialog::fillTable()
      case S_QUOTED_FIELD :
       if ( x == mTextQuote ) {
         state = S_MAYBE_END_OF_QUOTED_FIELD;
-      } else if ( x == '\n' ) {
+      } else if ( x == '\n' &&  mTextQuote.isNull() ) {
         setText( row - mStartLine + 1, column, field );
         field = "";
         if ( x == '\n' ) {
--
cgit v0.9.0.2