equal
deleted
inserted
replaced
23 #include "mpimlocalizationdata.h" |
23 #include "mpimlocalizationdata.h" |
24 #include "cpimvalidator.h" |
24 #include "cpimvalidator.h" |
25 #include "cpimitem.h" |
25 #include "cpimitem.h" |
26 #include "cpimitemmatcher.h" |
26 #include "cpimitemmatcher.h" |
27 #include "cpimstringmatcher.h" |
27 #include "cpimstringmatcher.h" |
28 #include "cleanupresetanddestroy.h" |
28 #include "javasymbianoslayer.h" |
29 #include "pimexternalchanges.h" |
29 #include "pimexternalchanges.h" |
30 #include "pimpanics.h" |
30 #include "pimpanics.h" |
31 #include "pimjnitools.h" |
31 #include "pimjnitools.h" |
32 #include "pimutils.h" |
32 #include "pimutils.h" |
33 #include "s60commonutils.h" |
33 #include "s60commonutils.h" |
925 for (i = 0; i < numRemovedItems; i++) |
925 for (i = 0; i < numRemovedItems; i++) |
926 { |
926 { |
927 User::LeaveIfError(newAndRemovedItems->Append( |
927 User::LeaveIfError(newAndRemovedItems->Append( |
928 tempRemovedItems[i])); |
928 tempRemovedItems[i])); |
929 } |
929 } |
930 |
930 CleanupStack::Pop(newAndRemovedItems); |
931 CleanupStack::Pop(); // newAndRemovedItems cleanup close |
931 CleanupStack::Pop(); // newAndRemovedItems cleanup close |
932 CleanupStack::Pop(newAndRemovedItems); |
932 |
933 |
933 |
934 CleanupStack::PopAndDestroy(); // tempRemovedItems cleanup close |
934 CleanupStack::PopAndDestroy(); // tempRemovedItems cleanup close |
935 CleanupStack::PopAndDestroy(); // tempNewItems cleanup close |
935 CleanupStack::PopAndDestroy(); // tempNewItems cleanup close |
936 |
936 |
937 return newAndRemovedItems; |
937 return newAndRemovedItems; |
1161 |
1161 |
1162 void CPIMList::HandleItemChangeNewL(const TPIMItemID aNewItemId, |
1162 void CPIMList::HandleItemChangeNewL(const TPIMItemID aNewItemId, |
1163 RPointerArray<CPIMItem>& aTempNewItems, CPIMItem* aMatchingItem) |
1163 RPointerArray<CPIMItem>& aTempNewItems, CPIMItem* aMatchingItem) |
1164 { |
1164 { |
1165 JELOG2(EPim); |
1165 JELOG2(EPim); |
1166 |
|
1167 // Create new item |
1166 // Create new item |
1168 CPIMItem* newItem = NULL; |
1167 CPIMItem* newItem = NULL; |
1169 TRAPD(errCreateItem, newItem = DoCreateItemL(aNewItemId, |
1168 TRAPD(errCreateItem, newItem = DoCreateItemL(aNewItemId, |
1170 aMatchingItem)); |
1169 aMatchingItem)); |
1171 |
1170 |
1178 } |
1177 } |
1179 else |
1178 else |
1180 { |
1179 { |
1181 User::LeaveIfError(errCreateItem); |
1180 User::LeaveIfError(errCreateItem); |
1182 } |
1181 } |
|
1182 |
|
1183 // OK |
1183 newItem->SetModified(EFalse); |
1184 newItem->SetModified(EFalse); |
1184 CleanupStack::PushL(newItem); |
1185 CleanupStack::PushL(newItem); |
1185 User::LeaveIfError(iItems.Append(newItem)); |
1186 User::LeaveIfError(iItems.Append(newItem)); |
1186 CleanupStack::Pop(newItem); |
1187 CleanupStack::Pop(newItem); |
|
1188 |
1187 // Add to list of new items |
1189 // Add to list of new items |
1188 CleanupClosePushL(aTempNewItems); |
1190 CleanupClosePushL(aTempNewItems); |
1189 TInt errAddToNewItems = aTempNewItems.Append(newItem); |
1191 TInt errAddToNewItems = aTempNewItems.Append(newItem); |
1190 if (errAddToNewItems != KErrNone) |
1192 if (errAddToNewItems != KErrNone) |
1191 { |
1193 { |
1213 } |
1215 } |
1214 else |
1216 else |
1215 { |
1217 { |
1216 User::LeaveIfError(errUpdateItem); |
1218 User::LeaveIfError(errUpdateItem); |
1217 } |
1219 } |
|
1220 |
|
1221 // OK |
1218 aModifiedItem.SetModified(EFalse); |
1222 aModifiedItem.SetModified(EFalse); |
1219 } |
1223 } |
1220 |
1224 |
1221 void CPIMList::HandleItemChangeRemovedL(TInt aRemovedItemIndex, |
1225 void CPIMList::HandleItemChangeRemovedL(TInt aRemovedItemIndex, |
1222 RPointerArray<CPIMItem>& aTempRemovedItems) |
1226 RPointerArray<CPIMItem>& aTempRemovedItems) |