equal
deleted
inserted
replaced
22 #include <calentryview.h> |
22 #include <calentryview.h> |
23 #include <CalenImporter.h> |
23 #include <CalenImporter.h> |
24 #include <CalenInterimUtils2.h> |
24 #include <CalenInterimUtils2.h> |
25 #include <s32mem.h> |
25 #include <s32mem.h> |
26 #include <s32file.h> |
26 #include <s32file.h> |
27 |
27 #include <mmfcontrollerpluginresolver.h> |
28 //User Include |
28 //User Include |
29 #include "calendarheader.h" |
29 #include "calendarheader.h" |
30 #include "calendarconstants.h" |
30 #include "calendarconstants.h" |
31 #include "asyncreqobserver.h" |
31 #include "asyncreqobserver.h" |
32 #include "calendarimport.h" |
32 #include "calendarimport.h" |
145 // It sets the LUids and GUids in the aOutputLocalUidArray, this object is not the owner of aOutputLocalUidArray |
145 // It sets the LUids and GUids in the aOutputLocalUidArray, this object is not the owner of aOutputLocalUidArray |
146 // -------------------------------------------------------------------------------------------------------- |
146 // -------------------------------------------------------------------------------------------------------- |
147 // |
147 // |
148 void CCalendarImport::ImportFromStreamL(RReadStream& aStream, RPointerArray<TUIDSet>& aOutputUIDArray ) |
148 void CCalendarImport::ImportFromStreamL(RReadStream& aStream, RPointerArray<TUIDSet>& aOutputUIDArray ) |
149 { |
149 { |
|
150 CleanupResetAndDestroyPushL(aOutputUIDArray); |
150 RPointerArray<CCalEntry> outputCalEntryArray; |
151 RPointerArray<CCalEntry> outputCalEntryArray; |
151 |
152 |
152 CleanupStack::PushL( TCleanupItem(CleanupCCalEntryArray, &outputCalEntryArray) ); |
153 CleanupStack::PushL( TCleanupItem(CleanupCCalEntryArray, &outputCalEntryArray) ); |
153 |
154 |
154 if ( iFormat->CompareF(KCalFmtVCal) == 0 ) |
155 if ( iFormat->CompareF(KCalFmtVCal) == 0 ) |
180 |
181 |
181 CleanupStack::Pop( newUid ); |
182 CleanupStack::Pop( newUid ); |
182 } |
183 } |
183 |
184 |
184 CleanupStack::PopAndDestroy( &outputCalEntryArray ); |
185 CleanupStack::PopAndDestroy( &outputCalEntryArray ); |
|
186 CleanupStack::Pop(&aOutputUIDArray); |
185 } |
187 } |
186 |
188 |
187 |
189 |
188 |
190 |
189 // -------------------------------------------------------------------------------------------------------- |
191 // -------------------------------------------------------------------------------------------------------- |