-rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 10 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 5 |
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 | |||
@@ -1660,4 +1660,6 @@ bool CalendarView::openCalendar(QString filename, bool merge) | |||
1660 | globalFlagBlockAgenda = 1; | 1660 | globalFlagBlockAgenda = 1; |
1661 | if (!merge) mCalendar->close(); | 1661 | if (!merge) { |
1662 | 1662 | mCalendar->close(); | |
1663 | mTodoList->clearList(); | ||
1664 | } | ||
1663 | mStorage->setFileName( filename ); | 1665 | mStorage->setFileName( filename ); |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index d88c300..32ad10a 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -58,4 +58,4 @@ LIBS += ../libical/lib/icalss.lib | |||
58 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 58 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
59 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT | 59 | QMAKE_LINK += /NODEFAULTLIB:MSVCRT |
60 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | 60 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib |
61 | OBJECTS_DIR = obj/win | 61 | OBJECTS_DIR = obj/win |
@@ -64,3 +64,8 @@ MOC_DIR = moc/win | |||
64 | #blabla: { | 64 | #blabla: { |
65 | debug: { | ||
66 | LIBS += mfc71ud.lib | ||
67 | } | ||
68 | release: { | ||
65 | LIBS += mfc71u.lib | 69 | LIBS += mfc71u.lib |
70 | } | ||
66 | DEFINES += _OL_IMPORT_ | 71 | DEFINES += _OL_IMPORT_ |
@@ -69,2 +74,3 @@ HEADERS += ../outport/msoutl9.h \ | |||
69 | koimportoldialog.h | 74 | koimportoldialog.h |
75 | |||
70 | SOURCES += ../outport/msoutl9.cpp \ | 76 | SOURCES += ../outport/msoutl9.cpp \ |
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index d368513..1ffc34a 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h | |||
@@ -141,2 +141,3 @@ class KOTodoView : public KOrg::BaseView | |||
141 | QString getWhatsThisText(QPoint p); | 141 | QString getWhatsThisText(QPoint p); |
142 | void clearList() {mTodoListView->clear(); } | ||
142 | 143 | ||
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2e5a943..fb4de37 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -833,3 +833,6 @@ void KOViewManager::setDocumentId( const QString &id ) | |||
833 | { | 833 | { |
834 | if (mTodoView) mTodoView->setDocumentId( id ); | 834 | if (mTodoView) { |
835 | mTodoView->clearList(); | ||
836 | mTodoView->setDocumentId( id ); | ||
837 | } | ||
835 | } | 838 | } |