uiutils/Findutil/src/FindUtilWestern.cpp
branchRCL_3
changeset 18 fcdfafb36fe7
parent 3 8ca85d2f0db7
child 19 aecbbf00d063
--- a/uiutils/Findutil/src/FindUtilWestern.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/src/FindUtilWestern.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -29,6 +29,9 @@
 #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('-');
@@ -309,7 +312,7 @@
         }
     else
     	{
-    TInt numChar = 1;
+        TInt numChar = 1;
     	if (!aContactsField.Length())
         	{
                 _LIT( KNone, "*" );
@@ -342,22 +345,24 @@
 //
 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 );
+        if ( aItemString.Length() == 0 )
+            {
+            return EFalse;
+            }
+    
+        if ( aSearchText.Length() == 0 )
+            {
+            return ETrue;
+            }
+        return IsFindMatch( aItemString, aSearchText, iInputLanguage );
     	}
     }
 
@@ -1310,6 +1315,12 @@
         {
         return EFalse;
         }
+		
+    if ( iFindUtilKorean )
+        {
+        return iFindUtilKorean->MatchAdaptiveRefineL(aItemString,aSearchText,aNextChars);   
+        }
+		
     if ( aSearchText.Length() == 0 )
         {        
         UpdateNextCharsFromString( aNextChars, aItemString );