diff -r deeea84a7639 -r 1509585cd8bf charconvfw/Charconv/ongoing/Source/main/CHARCONV.CPP --- a/charconvfw/Charconv/ongoing/Source/main/CHARCONV.CPP Mon Feb 08 15:30:13 2010 +0000 +++ b/charconvfw/Charconv/ongoing/Source/main/CHARCONV.CPP Wed Feb 10 17:58:29 2010 +0000 @@ -1043,7 +1043,7 @@ EXPORT_C CCnvCharacterSetConverter* CCnvCharacterSetConverter::NewLC() { CCnvCharacterSetConverter* characterSetConverter=new(ELeave) CCnvCharacterSetConverter; - characterSetConverter->iFullyConstructed=EFalse; + characterSetConverter->iTlsDataConstructed=EFalse; CleanupStack::PushL(characterSetConverter); characterSetConverter->ConstructL(); return characterSetConverter; @@ -1056,7 +1056,7 @@ { delete iStandardNamesAndMibEnums; FeatureManager::UnInitializeLib(); - if (iFullyConstructed) + if (iTlsDataConstructed) { TTlsData::CharacterSetConverterIsBeingDestroyed(); } @@ -2808,7 +2808,7 @@ iCharsetCnvCache = CCharsetCnvCache::NewL(); TTlsData::CharacterSetConverterIsBeingCreatedL(); FeatureManager::InitializeLibL(); - iFullyConstructed = ETrue; + iTlsDataConstructed = ETrue; } // set aIdentifierOfOnlyCharacterSetOfInterest to 0 if all character sets are of interest