| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
| -rw-r--r-- | korganizer/koimportoldialog.cpp | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 06d630a..52590d8 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -9,2 +9,5 @@ Removed "Allday" for allday events of one day duration in What's Next View. Added date range for allday events of more than one day duration in What's Next View. +Fixed two problems in the data importing from Outlook: + Fixed the duplicated import if the summary, location or description had whitespaces at the end. + Fixed a problem importing certain recurrence rules. diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp index 2af436c..79b97e8 100644 --- a/korganizer/koimportoldialog.cpp +++ b/korganizer/koimportoldialog.cpp @@ -253,5 +253,5 @@ void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRe } - event->setSummary( QString::fromUcs2( aItem->GetSubject().GetBuffer()) ); - event->setLocation( QString::fromUcs2( aItem->GetLocation().GetBuffer()) ); - event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer()).replace( QRegExp("\\r"), "") ); + event->setSummary( QString::fromUcs2( aItem->GetSubject().GetBuffer()).stripWhiteSpace() ); + event->setLocation( QString::fromUcs2( aItem->GetLocation().GetBuffer()).stripWhiteSpace() ); + event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer()).replace( QRegExp("\\r"), "").stripWhiteSpace() ); QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("; "), ";"); @@ -288,3 +288,3 @@ void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRe int freq = recpat.GetInterval(); - + if ( freq == 0 ) freq = 1; bool hasEndDate = !recpat.GetNoEndDate(); |