FCL/sf/mw/classicui: comparison uiutils/Findutil/src/FindUtilWestern.cpp

equal deleted inserted replaced

-:a1caeb42b3a3
+:fcdfafb36fe7
 #include <collate.h>
 #include <PtiIndicDefs.h>
 #include "FindUtilKorean.h"
 #include <avkon.rsg>
 #include <StringLoader.h>
+#include <featmgr.h>
+#include <bldvariant.hrh>
 const TInt KLitTab('\t');
 const TInt KLitSpace(' ');
 const TInt KLitHyphen('-');
 const TInt KLitLineFeed(8233);
 const TInt KLitStar('*');
 {
 return iFindUtilKorean->Match( aContactsField, aWord );
 }
 else
 	{
 TInt numChar = 1;
 	if (!aContactsField.Length())
 	{
 _LIT( KNone, "*" );
 	        if( aWord.CompareC(KNone()) == 0 )
 {
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TBool CFindUtilWestern::MatchRefineL( const TDesC& aItemString, const TDesC& aSearchText )
 {
-if ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || iFindUtilKorean->IsKoreanLanguage( aSearchText ) )
+if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) ||
+iFindUtilKorean->IsKoreanLanguage( aItemString ) ||
+iFindUtilKorean->IsKoreanLanguage( aSearchText ) )
 {
 return iFindUtilKorean->MatchRefineL( aItemString, aSearchText );
 }
 else
 {
 if ( aItemString.Length() == 0 )
 {
 return EFalse;
 }
 if ( aSearchText.Length() == 0 )
 {
 return ETrue;
 }
 return IsFindMatch( aItemString, aSearchText, iInputLanguage );
 	}
 }
 // -----------------------------------------------------------------------------
 // CFindUtilWestern::IsWordValidForMatching
 	{
 if ( aItemString.Length() == 0 )
 {
 return EFalse;
 }
+if ( iFindUtilKorean )
+{
+return iFindUtilKorean->MatchAdaptiveRefineL(aItemString,aSearchText,aNextChars);
+}
 if ( aSearchText.Length() == 0 )
 {
 UpdateNextCharsFromString( aNextChars, aItemString );
 return ETrue;
 }

branch	RCL_3
changeset 51	fcdfafb36fe7
parent 4	8ca85d2f0db7
child 55	aecbbf00d063