diff -r baf439b22ddd -r 2d690156cf8f mediasettings/mediasettingsengine/src/MPSettingsRopConfigParser.cpp --- a/mediasettings/mediasettingsengine/src/MPSettingsRopConfigParser.cpp Mon Jun 21 15:43:03 2010 +0300 +++ b/mediasettings/mediasettingsengine/src/MPSettingsRopConfigParser.cpp Thu Jul 15 18:41:27 2010 +0300 @@ -15,7 +15,7 @@ */ -// Version : %version: 3 % +// Version : %version: 4 % @@ -347,15 +347,13 @@ case EMPRopConfTypeString: { HBufC* str = aItem->iStringValue; - TInt strLength = str->Length(); - HBufC8* str8 = HBufC8::NewLC(strLength); - TPtr8 str8Ptr = str8->Des(); - CnvUtfConverter::ConvertFromUnicodeToUtf8(str8Ptr, *str); - - buf = HBufC8::NewL(aItem->iKey->Length() + strLength + KMPRopStringEntryPrototypeStaticLength); + HBufC8* str8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L( *str ); + CleanupStack::PushL( str8 ); + TInt str8Length = str8->Length(); + buf = HBufC8::NewL(aItem->iKey->Length() + str8Length + KMPRopStringEntryPrototypeStaticLength); TPtr8 ptr = buf->Des(); ptr.Format(KMPRopStringEntryPrototype, aItem->iKey, &(*str8)); - CleanupStack::PopAndDestroy(); //str8 + CleanupStack::PopAndDestroy( str8 ); break; } default: