--- a/phonebookui/Phonebook2/UIControls/src/CPbk2FieldListBoxModel.cpp Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FieldListBoxModel.cpp Fri Feb 19 22:40:27 2010 +0200
@@ -471,20 +471,13 @@
TPtr& aColumnText, TInt aColumnIndex ) const
{
TPbk2StoreContactAnalyzer analyzer( iParams.iContactManager, NULL );
- TBool clip = analyzer.IsFieldTypeIncludedL
- ( aField, R_PHONEBOOK2_PHONENUMBER_SELECTOR );
-
- if ( !clip )
+
+ if ( analyzer.IsFieldTypeIncludedL( aField, R_PHONEBOOK2_PHONENUMBER_SELECTOR )
+ || analyzer.IsFieldTypeIncludedL ( aField, R_PHONEBOOK2_EMAIL_SELECTOR )
+ || analyzer.IsFieldTypeIncludedL( aField, R_PHONEBOOK2_SIP_SELECTOR )
+ || analyzer.IsFieldTypeIncludedL( aField, R_PHONEBOOK2_IMPP_SELECTOR ) )
{
- clip = analyzer.IsFieldTypeIncludedL
- ( aField, R_PHONEBOOK2_EMAIL_SELECTOR );
- }
-
- // Clip if required
- if ( clip )
- {
- iTextClipper->ClipFromBeginning
- ( aColumnText, aIndex, aColumnIndex );
+ iTextClipper->ClipFromBeginning( aColumnText, aIndex, aColumnIndex );
}
}