equal
deleted
inserted
replaced
1114 } |
1114 } |
1115 |
1115 |
1116 if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)) |
1116 if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)) |
1117 { |
1117 { |
1118 //fill the CTSY pointer |
1118 //fill the CTSY pointer |
1119 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1); |
1119 TRAP ( aError, |
1120 iPhonebookReadPtrs[aPhonebook] = readEntries; |
1120 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1); |
1121 |
1121 iPhonebookReadPtrs[aPhonebook] = readEntries; |
1122 TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); |
1122 FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); |
1123 } |
1123 } |
1124 |
1124 |
1125 CPhoneBookDataPackage phoneBookDataPackage; |
1125 CPhoneBookDataPackage phoneBookDataPackage; |
1126 phoneBookDataPackage.SetPhoneBookName(PhonebookName(aPhonebook)); |
1126 phoneBookDataPackage.SetPhoneBookName(PhonebookName(aPhonebook)); |
1127 phoneBookDataPackage.PackData(&(iPhonebookReadPtrs[aPhonebook])); |
1127 phoneBookDataPackage.PackData(&(iPhonebookReadPtrs[aPhonebook])); |
1183 iPhonebookCachePtrs[aPhonebook] = NULL; |
1183 iPhonebookCachePtrs[aPhonebook] = NULL; |
1184 } |
1184 } |
1185 |
1185 |
1186 if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)/* && (iPhonebookCachePtrs[aPhonebook])*/) |
1186 if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)/* && (iPhonebookCachePtrs[aPhonebook])*/) |
1187 { |
1187 { |
1188 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1); |
1188 TRAP(aError, |
1189 iPhonebookCachePtrs[aPhonebook] = readEntries; |
1189 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1); |
1190 |
1190 iPhonebookCachePtrs[aPhonebook] = readEntries; |
1191 TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); |
1191 FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); |
1192 |
1192 |
1193 if(aError) |
1193 if(aError) |
1194 { |
1194 { |
1195 iPhonebookCachePtrs[aPhonebook]->ResetAndDestroy(); |
1195 iPhonebookCachePtrs[aPhonebook]->ResetAndDestroy(); |
1196 } |
1196 } |
1197 } |
1197 } |