Fixed the memory leak

[platform/framework/native/appfw.git] / src / text / FText_Ucs2EncodingCore.cpp

diff --git a/src/text/FText_Ucs2EncodingCore.cpp b/src/text/FText_Ucs2EncodingCore.cpp
index a3edbd9..248e38a 100644 (file)
--- a/src/text/FText_Ucs2EncodingCore.cpp
+++ b/src/text/FText_Ucs2EncodingCore.cpp
@@ -56,12 +56,8 @@ _Ucs2EncodingCore::GetEncodingCoreImplN(const Tizen::Base::String& encodingFrom,
 
        encodingStr.Replace(L"-", "");
        encodingStr.Replace("_", "");
-       
-       if (!encodingStr.StartsWith(L"UCS2", 0))
-       {
-               SetLastResult(E_UNSUPPORTED_TYPE);
-               return null;
-       }
+
+       SysTryReturn(NID_TEXT, encodingStr.StartsWith(L"UCS2", 0), null, E_UNSUPPORTED_TYPE, "[E_UNSUPPORTED_TYPE] It is the unsupported type");
 
        if ((encodingStr == "UCS2") || (encodingStr == "UCS2BE") || (encodingStr == "UCS2LE"))
        {
@@ -91,29 +87,6 @@ _Ucs2EncodingCore::GetEncodingCoreImplN(const Tizen::Base::String& encodingFrom,
        return null;
 }
 
-result
-_Ucs2EncodingCore::GetAvailableEncodingsN(Tizen::Base::Collection::IList* pEncodingList)
-{
-       SysTryReturnResult(NID_TEXT, pEncodingList, E_INVALID_ARG,
-                       "[%s] Invalid argument is used. Input encoding list is null", GetErrorMessage(E_INVALID_ARG));
-
-       result r = E_SUCCESS;
-       String* pEncodingStr = null;
-       for (int i = 0; i < SUPPORTED_ENCODINGS_LENGTH; i++)
-       {
-               pEncodingStr = new (std::nothrow) String(supportedEncodings[i]);
-               SysTryReturnResult(NID_TEXT, pEncodingStr, E_OUT_OF_MEMORY, "Unable to allocate memory for encoding string.");
-
-               r = pEncodingList->Add(*pEncodingStr);
-               if (IsFailed(r))
-               {
-                       delete pEncodingStr;
-                       return r;
-               }
-       }
-
-       return r;
-}
 
 String
 _Ucs2EncodingCore::GetName(void)