diff -r ce057bb09d0b -r 5fae379060a7 utilitylibraries/libutils/src/wstringtodescriptor16.cpp --- a/utilitylibraries/libutils/src/wstringtodescriptor16.cpp Fri Jun 04 16:20:51 2010 +0100 +++ b/utilitylibraries/libutils/src/wstringtodescriptor16.cpp Fri Jun 11 15:26:22 2010 +0300 @@ -59,7 +59,7 @@ * @param aSrc is the wstring to be converted , aDes is the * reference to the descriptor where the result of conversion * is stored - * @return Status code (0 is ESuccess, -3 is EStringNoData) + * @return Status code (0 is ESuccess, -3 is EStringNoData, -1 is EInsufficientMemory) */ EXPORT_C int WstringToTptr16(wstring& aSrc, TPtr16& aDes ) @@ -114,7 +114,7 @@ * reference to the descriptor where the result of conversion * is stored * @return Status code (0 is ESuccess, -1 is EInsufficientMemory, - * -3 is EStringNoData ) + * -3 is EStringNoData, -4 is EInvalidPointer ) */ EXPORT_C int WstringToHbufc16(wstring& aSrc, HBufC16* aDes) @@ -168,15 +168,8 @@ } wlen = wcslen(wcharString); - - if (KErrNone == aDes.Create(wlen)) - { - aDes.Copy((const unsigned short *)wcharString, wlen); - } - else - { - retval = EInsufficientSystemMemory; - } - - return retval; + + aDes.Copy((const unsigned short *)wcharString, wlen); + + return retval; }