--- a/phonebookui/Phonebook2/UIControls/src/CPbk2AdaptiveSearchGridFiller.cpp Mon Jun 21 15:24:27 2010 +0300
+++ b/phonebookui/Phonebook2/UIControls/src/CPbk2AdaptiveSearchGridFiller.cpp Thu Jul 15 18:22:55 2010 +0300
@@ -777,9 +777,18 @@
{
TBool result = ETrue;
const TInt fieldCount = aContact.Fields().FieldCount();
- for ( TInt i = ENameFirstPart; i <= ENameSecondPart && i < fieldCount; ++i)
- {
- const MVPbkBaseContactField& field = aContact.Fields().FieldAt( i );
+ if ( fieldCount > ENameCompanyPart )
+ {
+ const MVPbkBaseContactField& field = aContact.Fields().FieldAt( ENameCompanyPart );
+ if ( iNameFormatter.IsTitleField( field ) )
+ {
+ return EFalse;
+ }
+ }
+
+ if ( fieldCount > ENameFirstPart )
+ {
+ const MVPbkBaseContactField& field = aContact.Fields().FieldAt( ENameFirstPart );
if ( iNameFormatter.IsTitleField( field ) )
{
const MVPbkContactFieldData& fieldData = field.FieldData();
@@ -799,7 +808,6 @@
if ( firstNonSpaceChar != length )
{
result = EFalse;
- break;
}
}
}