equal
deleted
inserted
replaced
112 { |
112 { |
113 iFieldFirst = &aFieldFirst; |
113 iFieldFirst = &aFieldFirst; |
114 iFieldSecond = &aFieldSecond; |
114 iFieldSecond = &aFieldSecond; |
115 |
115 |
116 const MVPbkFieldType* fieldType = aFieldFirst.BestMatchingFieldType(); |
116 const MVPbkFieldType* fieldType = aFieldFirst.BestMatchingFieldType(); |
117 __ASSERT_ALWAYS( fieldType, Panic( EPbk2FieldTypeNotExists ) ); |
117 if ( fieldType ) |
118 |
118 { |
119 if( fieldType->NonVersitType() == EVPbkNonVersitTypeCodImage ) |
119 if( fieldType->NonVersitType() == EVPbkNonVersitTypeCodImage ) |
120 { |
|
121 iConflictType = EPbk2ConflictTypeImage; |
|
122 } |
|
123 else |
|
124 { |
|
125 TArray<TVPbkFieldVersitProperty> versitPropArr = fieldType->VersitProperties(); |
|
126 TInt count = versitPropArr.Count(); |
|
127 |
|
128 for( TInt idx = 0; idx < count; idx++ ) |
|
129 { |
120 { |
130 TVPbkFieldVersitProperty versitProp = versitPropArr[idx]; |
121 iConflictType = EPbk2ConflictTypeImage; |
131 if( versitProp.Name() == EVPbkVersitNameLOGO || |
122 } |
132 versitProp.Name() == EVPbkVersitNamePHOTO ) |
123 else |
|
124 { |
|
125 TArray<TVPbkFieldVersitProperty> versitPropArr = fieldType->VersitProperties(); |
|
126 TInt count = versitPropArr.Count(); |
|
127 |
|
128 for( TInt idx = 0; idx < count; idx++ ) |
133 { |
129 { |
134 iConflictType = EPbk2ConflictTypeImage; |
130 TVPbkFieldVersitProperty versitProp = versitPropArr[idx]; |
135 break; |
131 if( versitProp.Name() == EVPbkVersitNameLOGO || |
|
132 versitProp.Name() == EVPbkVersitNamePHOTO ) |
|
133 { |
|
134 iConflictType = EPbk2ConflictTypeImage; |
|
135 break; |
|
136 } |
136 } |
137 } |
137 } |
138 } |
138 } |
139 } |
139 } |
140 } |
140 |
141 |
246 // -------------------------------------------------------------------------- |
247 // -------------------------------------------------------------------------- |
247 // |
248 // |
248 void CPbk2MergeConflict::CustomizeTextValueL( const MVPbkStoreContactField& aField, TDes& aBuf ) |
249 void CPbk2MergeConflict::CustomizeTextValueL( const MVPbkStoreContactField& aField, TDes& aBuf ) |
249 { |
250 { |
250 const MVPbkFieldType* fieldType= aField.BestMatchingFieldType(); |
251 const MVPbkFieldType* fieldType= aField.BestMatchingFieldType(); |
251 TVPbkNonVersitFieldType nonVersitType = fieldType->NonVersitType(); |
252 if ( fieldType ) |
252 if ( nonVersitType == EVPbkNonVersitTypeRingTone ) |
253 { |
253 { |
254 TVPbkNonVersitFieldType nonVersitType = fieldType->NonVersitType(); |
254 TParsePtr fileName = TParsePtr( aBuf ); |
255 if ( nonVersitType == EVPbkNonVersitTypeRingTone ) |
255 if ( fileName.NamePresent() ) |
|
256 { |
256 { |
257 TPtrC namePtr = fileName.Name(); |
257 TParsePtr fileName = TParsePtr( aBuf ); |
258 HBufC* name = namePtr.AllocL(); |
258 if ( fileName.NamePresent() ) |
259 aBuf.Copy( *name ); |
259 { |
260 delete name; |
260 TPtrC namePtr = fileName.Name(); |
|
261 HBufC* name = namePtr.AllocL(); |
|
262 aBuf.Copy( *name ); |
|
263 delete name; |
|
264 } |
261 } |
265 } |
262 } |
266 } |
263 } |
267 } |
264 |
268 |
265 // -------------------------------------------------------------------------- |
269 // -------------------------------------------------------------------------- |