diff -r fcdfafb36fe7 -r aecbbf00d063 uiutils/Findutil/src/FindUtilWestern.cpp --- a/uiutils/Findutil/src/FindUtilWestern.cpp Thu Aug 19 10:11:06 2010 +0300 +++ b/uiutils/Findutil/src/FindUtilWestern.cpp Tue Aug 31 15:28:30 2010 +0300 @@ -29,9 +29,6 @@ #include "FindUtilKorean.h" #include #include -#include -#include - const TInt KLitTab('\t'); const TInt KLitSpace(' '); const TInt KLitHyphen('-'); @@ -312,18 +309,10 @@ } else { - TInt numChar = 1; + TInt numChar = 1; if (!aContactsField.Length()) { - _LIT( KNone, "*" ); - if( aWord.CompareC(KNone()) == 0 ) - { - return ETrue; - } - else - { - return EFalse; - } + return EFalse; } if((aWord.Length() > 1) && aWord[aWord.Length()-2] == 0x200B) { @@ -345,24 +334,22 @@ // TBool CFindUtilWestern::MatchRefineL( const TDesC& aItemString, const TDesC& aSearchText ) { - if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) || - iFindUtilKorean->IsKoreanLanguage( aItemString ) || - iFindUtilKorean->IsKoreanLanguage( aSearchText ) ) + if ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || iFindUtilKorean->IsKoreanLanguage( aSearchText ) ) { return iFindUtilKorean->MatchRefineL( aItemString, aSearchText ); } else + { + if ( aItemString.Length() == 0 ) { - if ( aItemString.Length() == 0 ) - { - return EFalse; - } - - if ( aSearchText.Length() == 0 ) - { - return ETrue; - } - return IsFindMatch( aItemString, aSearchText, iInputLanguage ); + return EFalse; + } + + if ( aSearchText.Length() == 0 ) + { + return ETrue; + } + return IsFindMatch( aItemString, aSearchText, iInputLanguage ); } } @@ -1315,12 +1302,6 @@ { return EFalse; } - - if ( iFindUtilKorean ) - { - return iFindUtilKorean->MatchAdaptiveRefineL(aItemString,aSearchText,aNextChars); - } - if ( aSearchText.Length() == 0 ) { UpdateNextCharsFromString( aNextChars, aItemString ); @@ -1332,12 +1313,6 @@ iDigraphChars = StringLoader::LoadL( R_QTN_ADS_DIGRAPH ); TPtr digraph = iDigraphChars->Des(); digraph.UpperCase(); - - _LIT( KMissing,"#MISSING" ); - if( digraph.CompareC(KMissing()) == 0 ) - { - digraph = KNullDesC; - } } TBuf itemString(aItemString);