--- a/javaextensions/pim/versit/src.s60/cpimcalendarconverter.cpp Mon May 03 12:27:20 2010 +0300
+++ b/javaextensions/pim/versit/src.s60/cpimcalendarconverter.cpp Fri May 14 15:47:24 2010 +0300
@@ -30,7 +30,7 @@
#include "cpimeventpropertyconverter.h"
#include "fs_methodcall.h"
#include "logger.h"
-#include "cleanupresetanddestroy.h"
+#include "javasymbianoslayer.h"
// EXTERNAL INCLUDES
#include <vcal.h>
@@ -242,7 +242,7 @@
RPointerArray<CPIMItem>& aItemArray)
{
JELOG2(EPim);
- CleanupResetAndDestroyPushL(aItemArray);
+
CPIMEventItem* item = CPIMEventItem::NewLC(iEventValidator);
TPIMDate alarm(TInt64(0));
// We don't take the ownership of the propertyArray, so the properties
@@ -269,6 +269,7 @@
item->addInt(EPIMEventAlarm, KPIMAttrNone, interval.Int());
}
}
+ CleanupClosePushL(aItemArray);
User::LeaveIfError(aItemArray.Append(item));
CleanupStack::Pop(item); // item
CleanupStack::Pop(&aItemArray);
@@ -283,7 +284,7 @@
RPointerArray<CPIMItem>& aItemArray)
{
JELOG2(EPim);
- CleanupResetAndDestroyPushL(aItemArray);
+
CPIMToDoItem* item = CPIMToDoItem::NewLC(iToDoValidator);
TPIMDate alarm(TInt64(0));
// We don't take the ownership of the propertyArray, so the properties
@@ -318,6 +319,7 @@
{
item->AddBooleanL(EPIMToDoCompleted, KPIMAttrNone, ETrue);
}
+ CleanupClosePushL(aItemArray);
User::LeaveIfError(aItemArray.Append(item));
CleanupStack::Pop(item); // item
CleanupStack::Pop(&aItemArray);