equal
deleted
inserted
replaced
233 // |
233 // |
234 void CPbk2MergeConflict::GetChosenFieldsL( |
234 void CPbk2MergeConflict::GetChosenFieldsL( |
235 RPointerArray<MVPbkStoreContactField>& aAddressFields ) |
235 RPointerArray<MVPbkStoreContactField>& aAddressFields ) |
236 { |
236 { |
237 __ASSERT_ALWAYS( iFieldFirst && iFieldSecond, Panic( EPbk2NotChosen ) ); |
237 __ASSERT_ALWAYS( iFieldFirst && iFieldSecond, Panic( EPbk2NotChosen ) ); |
|
238 CleanupClosePushL( aAddressFields ); |
238 |
239 |
239 if ( iChosenField ) |
240 if ( iChosenField ) |
240 { |
241 { |
241 aAddressFields.AppendL( iChosenField ); |
242 aAddressFields.AppendL( iChosenField ); |
242 } |
243 } |
|
244 CleanupStack::Pop(); |
243 } |
245 } |
244 |
246 |
245 // -------------------------------------------------------------------------- |
247 // -------------------------------------------------------------------------- |
246 // CPbk2MergeConflict::CustomizeTextValueL |
248 // CPbk2MergeConflict::CustomizeTextValueL |
247 // -------------------------------------------------------------------------- |
249 // -------------------------------------------------------------------------- |
383 void CPbk2MergeConflictAddress::GetChosenFieldsL( |
385 void CPbk2MergeConflictAddress::GetChosenFieldsL( |
384 RPointerArray<MVPbkStoreContactField>& aAddressFields ) |
386 RPointerArray<MVPbkStoreContactField>& aAddressFields ) |
385 { |
387 { |
386 __ASSERT_ALWAYS( iContactChosenAddress, Panic( EPbk2NotChosen ) ); |
388 __ASSERT_ALWAYS( iContactChosenAddress, Panic( EPbk2NotChosen ) ); |
387 |
389 |
|
390 CleanupClosePushL( aAddressFields ); |
388 CPbk2PresentationContactFieldCollection& fields = iContactChosenAddress->PresentationFields(); |
391 CPbk2PresentationContactFieldCollection& fields = iContactChosenAddress->PresentationFields(); |
389 |
392 |
390 for( TInt idx = 0; idx < fields.FieldCount(); idx++ ) |
393 for( TInt idx = 0; idx < fields.FieldCount(); idx++ ) |
391 { |
394 { |
392 CPbk2PresentationContactField& field = fields.At( idx ); |
395 CPbk2PresentationContactField& field = fields.At( idx ); |
394 if( property.GroupId() == iAddressGroup ) |
397 if( property.GroupId() == iAddressGroup ) |
395 { |
398 { |
396 aAddressFields.AppendL( &field ); |
399 aAddressFields.AppendL( &field ); |
397 } |
400 } |
398 } |
401 } |
399 } |
402 CleanupStack::Pop(); |
400 |
403 } |
|
404 |