ol fix

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
@@ -1,33 +1,36 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.17 ************
 
 KO/Pi:
 Added option to display times in What's Next View on two lines.
 (Useful for display on the Zaurus with 240x320 screen)
 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.  
 
 ********** VERSION 2.1.16 ************
 
 Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus.
 Added columns for datetime in todo view: Last modified, created and last modified subtodo
 Fixed a bug in agenda view displaying recurring multiday events which are longer than two days.
 Made conflict detection up to 4 times faster.
 
 ********** VERSION 2.1.15 ************
 
 Fixed two layout problems on the Z:
 Made the with of the newly added buttons on the Quick-Todo smaller.
 Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible.
 
 
 ********** VERSION 2.1.14 ************
 
 Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
 Added a button to add a subtodo quickly.
 
 Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ).
 Added an option to change the layout of the list week to column mode.
 
 Fixed some usability problems in pi-sync mode by adding some progress information about file transfer.
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 2af436c..79b97e8 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -230,84 +230,84 @@ void KOImportOLdialog::readCalendarData( DWORD folder )
       indx = (long)i;
       itm = folderItems.Item(indx.Detach());
       _AppointmentItem * pItem = (_AppointmentItem *)&itm;
       ol2kopiCalendar( pItem );
       itm->Release();
     }
 }
 void KOImportOLdialog::slotOk()
 {
    QDialog::accept();
 }
 
 void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRecurrence )
 {
   KCal::Event* event = new KCal::Event();
   if ( aItem->GetAllDayEvent() ){
     event->setDtStart( QDateTime( mDdate2Qdtr( aItem->GetStart()).date(),QTime(0,0,0 ) ));
     event->setDtEnd( QDateTime( mDdate2Qdtr( aItem->GetEnd()) .date(),QTime(0,0,0 )).addDays(-1));
     event->setFloats( true );
   } else {
     event->setDtStart( mDdate2Qdtr( aItem->GetStart()) );
     event->setDtEnd( mDdate2Qdtr( aItem->GetEnd()) );
     event->setFloats( false );
   }
-  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("; "), ";");
   event->setCategories( QStringList::split( ";", cat ) );
   if ( aItem->GetReminderSet() ) {
     event->clearAlarms();
     Alarm* alarm = event->newAlarm();
     alarm->setStartOffset( -aItem->GetReminderMinutesBeforeStart()*60 );
     alarm->setEnabled( true );
     if ( aItem->GetReminderPlaySound() ) {
       alarm->setType( Alarm::Audio );
       alarm->setAudioFile( QString::fromUcs2( aItem->GetReminderSoundFile().GetBuffer()));
       }
     else
       alarm->setType( Alarm::Display );
     alarm->setRepeatCount( aItem->GetReplyTime() );
   }
   // OL :pub 0 - pers 1  -  priv 2 -  conf 3
   // KO : pub 0  -  priv 1 -  conf 2
   int sec =   aItem->GetSensitivity() ;
   if ( sec > 1 )// mapping pers -> private
     --sec;
   event->setSecrecy( sec );
   if ( aItem->GetBusyStatus() == 0 )
     event->setTransparency( Event::Transparent);// OL free
   else
             event->setTransparency( Event::Opaque);//OL all other
 
   if ( aItem->GetIsRecurring() && computeRecurrence ) { //recur
 
     RecurrencePattern recpat = aItem->GetRecurrencePattern();
  
     QDate startDate = mDdate2Qdtr(recpat.GetPatternStartDate()).date();
     int freq = recpat.GetInterval();
-    
+    if ( freq == 0 ) freq = 1;
     bool hasEndDate = !recpat.GetNoEndDate();
     QDate endDate = mDdate2Qdtr(recpat.GetPatternEndDate()).date();
     QBitArray weekDays( 7 );
     weekDays.fill(false );
     uint weekDaysNum = recpat.GetDayOfWeekMask();
     int i;
     int bb = 2;
     for( i = 1; i <= 6; ++i ) {
       weekDays.setBit( i - 1, ( bb & weekDaysNum )); 
       bb =  4 << (i-1);
       //qDebug(" %d bit %d ",i-1,weekDays.at(i-1) );
     }
     if ( 1 & weekDaysNum)
       weekDays.setBit( 6 );
     // int pos = 1;// pending
 
     Recurrence *r = event->recurrence();
     int rtype = recpat.GetRecurrenceType();
     //recurrence types are:
     /*
         olRecursDaily(0)
         olRecursWeekly(1)
         olRecursMonthly(2)
         olRecursMonthNth(3)