--- a/phonebookui/Phonebook2/CommandsExtension/inc/CPbk2MergeResolver.h Mon Jun 21 15:24:27 2010 +0300
+++ b/phonebookui/Phonebook2/CommandsExtension/inc/CPbk2MergeResolver.h Thu Jul 15 18:22:55 2010 +0300
@@ -131,6 +131,9 @@
void AddConflictL(
const MVPbkStoreContactField& aFieldFirst,
const MVPbkStoreContactField& aFieldSecond );
+ HBufC* SyncDisplayFieldLC(
+ const MVPbkStoreContactField& aField );
+ HBufC* LocaliseSyncDisplayFieldLC( const TDesC& aContent );
void AddAddressConflictL( TPbk2FieldGroupId aGroupId );
TInt FindConflictByFieldL( const MVPbkStoreContactField& aField );
void PrintFieldL(const MVPbkStoreContactField & aField);