uiutils/Findutil/src/FindUtilWestern.cpp
branchRCL_3
changeset 59 978afdc0236f
parent 56 d48ab3b357f1
child 72 a5e7a4f63858
--- a/uiutils/Findutil/src/FindUtilWestern.cpp	Wed Sep 01 12:16:19 2010 +0100
+++ b/uiutils/Findutil/src/FindUtilWestern.cpp	Tue Sep 14 21:48:24 2010 +0300
@@ -286,10 +286,12 @@
 		iNotifyHandler->StartListeningL();
 	    }	
 //TSW: LYEE-7Q2GRV  
-	if(!iFindUtilKorean)
-	    {
+    FeatureManager::InitializeLibL();
+    if( !iFindUtilKorean && FeatureManager::FeatureSupported( KFeatureIdKorean ) )
+        {
         iFindUtilKorean = CFindUtilKorean::NewL();
-	    }
+        }
+    FeatureManager::UnInitializeLib();
 	}
 	
 void CFindUtilWestern::HandleNotifyInt( TUint32 aId, TInt aNewValue )
@@ -306,7 +308,7 @@
 
 TBool CFindUtilWestern::Match(const TDesC& aContactsField, const TDesC& aWord)
     {
-    if ( iFindUtilKorean->IsKoreanLanguage( aContactsField ) || iFindUtilKorean->IsKoreanLanguage( aWord ) )
+    if ( iFindUtilKorean && ( iFindUtilKorean->IsKoreanLanguage( aContactsField ) || iFindUtilKorean->IsKoreanLanguage( aWord ) ) )
         {
         return iFindUtilKorean->Match( aContactsField, aWord );	
         }
@@ -345,9 +347,9 @@
 //
 TBool CFindUtilWestern::MatchRefineL( const TDesC& aItemString, const TDesC& aSearchText )
     {
-    if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) || 
-         iFindUtilKorean->IsKoreanLanguage( aItemString ) || 
-         iFindUtilKorean->IsKoreanLanguage( aSearchText ) )
+    if ( iFindUtilKorean && 
+        ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || 
+          iFindUtilKorean->IsKoreanLanguage( aSearchText ) ) )
         {
         return iFindUtilKorean->MatchRefineL( aItemString, aSearchText );	
         }
@@ -1316,7 +1318,7 @@
         return EFalse;
         }
 		
-    if ( iFindUtilKorean )
+    if ( iFindUtilKorean && ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || iFindUtilKorean->IsKoreanLanguage( aSearchText ) ) )
         {
         return iFindUtilKorean->MatchAdaptiveRefineL(aItemString,aSearchText,aNextChars);   
         }