--- a/javaextensions/pim/framework/src.s60/cpimlist.cpp Wed Sep 15 12:05:25 2010 +0300
+++ b/javaextensions/pim/framework/src.s60/cpimlist.cpp Wed Oct 13 14:23:59 2010 +0300
@@ -25,7 +25,7 @@
#include "cpimitem.h"
#include "cpimitemmatcher.h"
#include "cpimstringmatcher.h"
-#include "cleanupresetanddestroy.h"
+#include "javasymbianoslayer.h"
#include "pimexternalchanges.h"
#include "pimpanics.h"
#include "pimjnitools.h"
@@ -927,9 +927,9 @@
User::LeaveIfError(newAndRemovedItems->Append(
tempRemovedItems[i]));
}
-
+ CleanupStack::Pop(newAndRemovedItems);
CleanupStack::Pop(); // newAndRemovedItems cleanup close
- CleanupStack::Pop(newAndRemovedItems);
+
CleanupStack::PopAndDestroy(); // tempRemovedItems cleanup close
CleanupStack::PopAndDestroy(); // tempNewItems cleanup close
@@ -1163,7 +1163,6 @@
RPointerArray<CPIMItem>& aTempNewItems, CPIMItem* aMatchingItem)
{
JELOG2(EPim);
-
// Create new item
CPIMItem* newItem = NULL;
TRAPD(errCreateItem, newItem = DoCreateItemL(aNewItemId,
@@ -1180,10 +1179,13 @@
{
User::LeaveIfError(errCreateItem);
}
+
+ // OK
newItem->SetModified(EFalse);
CleanupStack::PushL(newItem);
User::LeaveIfError(iItems.Append(newItem));
CleanupStack::Pop(newItem);
+
// Add to list of new items
CleanupClosePushL(aTempNewItems);
TInt errAddToNewItems = aTempNewItems.Append(newItem);
@@ -1215,6 +1217,8 @@
{
User::LeaveIfError(errUpdateItem);
}
+
+ // OK
aModifiedItem.SetModified(EFalse);
}