| author | zautrix <zautrix> | 2005-04-29 12:18:46 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-04-29 12:18:46 (UTC) |
| commit | bdaded2da25b0ccef80d6e638fa12f92a4f8744d (patch) (unidiff) | |
| tree | 4ab99ccab5c3610a26df59c6f79204e054c32dd5 /kaddressbook | |
| parent | 8fbdf5d2b0ee1e1496cb856e0ead37c668066353 (diff) | |
| download | kdepimpi-bdaded2da25b0ccef80d6e638fa12f92a4f8744d.zip kdepimpi-bdaded2da25b0ccef80d6e638fa12f92a4f8744d.tar.gz kdepimpi-bdaded2da25b0ccef80d6e638fa12f92a4f8744d.tar.bz2 | |
another csv import fix
| -rw-r--r-- | kaddressbook/xxport/csvimportdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
| 358 | if ( counter == (int)( posToType( item->currentItem() ) - mCustomCounter ) ) | 358 | if ( counter == (int)( posToType( item->currentItem() ) - mCustomCounter ) ) |
| 359 | { | 359 | { |
| 360 | (*it)->setValue( a, value ); | 360 | (*it)->setValue( a, value ); |
| 361 | continue; | 361 | break; |
| 362 | } | 362 | } |
| 363 | ++counter; | 363 | ++counter; |
| 364 | } | 364 | } |
| @@ -541,7 +541,7 @@ void CSVImportDialog::fillTable() | |||
| 541 | case S_QUOTED_FIELD : | 541 | case S_QUOTED_FIELD : |
| 542 | if ( x == mTextQuote ) { | 542 | if ( x == mTextQuote ) { |
| 543 | state = S_MAYBE_END_OF_QUOTED_FIELD; | 543 | state = S_MAYBE_END_OF_QUOTED_FIELD; |
| 544 | } else if ( x == '\n' ) { | 544 | } else if ( x == '\n' && mTextQuote.isNull() ) { |
| 545 | setText( row - mStartLine + 1, column, field ); | 545 | setText( row - mStartLine + 1, column, field ); |
| 546 | field = ""; | 546 | field = ""; |
| 547 | if ( x == '\n' ) { | 547 | if ( x == '\n' ) { |