4 files changed, 17 insertions, 5 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 904bbe2..a8ad467 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1655,14 +1655,16 @@ bool CalendarView::openCalendar(QString filename, bool merge)
     if (!QFile::exists(filename)) {
         KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename));
         return false;
     }
 
     globalFlagBlockAgenda = 1;
-    if (!merge) mCalendar->close();
-
+    if (!merge) {
+      mCalendar->close();
+      mTodoList->clearList();
+    }
     mStorage->setFileName( filename );
 
     if ( mStorage->load() ) {
         if ( merge ) ;//setModified( true );
         else {
             //setModified( true );
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index d88c300..32ad10a 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -53,23 +53,29 @@ LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
-#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
-#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
+QMAKE_LINK += /NODEFAULTLIB:MSVCRT
+QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 #blabla: {
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
 LIBS += mfc71u.lib
+}
 DEFINES +=  _OL_IMPORT_
 
 HEADERS += ../outport/msoutl9.h \
  koimportoldialog.h 
+
 SOURCES += ../outport/msoutl9.cpp \
  koimportoldialog.cpp
 #}
 #olimport section end
 
 }
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d368513..1ffc34a 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -136,12 +136,13 @@ class KOTodoView : public KOrg::BaseView
     void saveLayout(KConfig *config, const QString &group) const;
     void restoreLayout(KConfig *config, const QString &group);
     /** Create a popup menu to set categories */
     QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
     void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
     QString getWhatsThisText(QPoint p);
+    void clearList() {mTodoListView->clear(); }
 
   public slots:
     void updateView();
     void updateConfig();
 
     void changeEventDisplay(Event *, int);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2e5a943..fb4de37 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -828,8 +828,11 @@ void KOViewManager::addView(KOrg::BaseView *view)
     mMainView->viewStack()->addWidget( view, 1 );
 #endif
 }
 
 void KOViewManager::setDocumentId( const QString &id )
 {
-    if (mTodoView) mTodoView->setDocumentId( id );
+    if (mTodoView) {
+      mTodoView->clearList();
+      mTodoView->setDocumentId( id );
+    }
 }