From 4799ffdfe338ea7937675ef985b26b985207a73e Mon Sep 17 00:00:00 2001 From: Hokwon Song Date: Wed, 24 Jul 2013 17:51:46 +0900 Subject: [PATCH] Update the filtering encoding types Change-Id: I94462aab2a3254edc77d1e55932fa9236be5198c Signed-off-by: Hokwon Song --- src/text/FText_EncodingCore.cpp | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/text/FText_EncodingCore.cpp b/src/text/FText_EncodingCore.cpp index 2e6261b..57063d7 100644 --- a/src/text/FText_EncodingCore.cpp +++ b/src/text/FText_EncodingCore.cpp @@ -52,28 +52,37 @@ _EncodingCore::GetEncodingCoreN(const Tizen::Base::String& encodingFrom, const T { _EncodingCore* pEncoderDecoder = null; - pEncoderDecoder = _Ucs2EncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); - if (pEncoderDecoder) + if (encodingFrom.Contains(L"UCS-2") == true) { - return pEncoderDecoder; + pEncoderDecoder = _Ucs2EncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); + if (pEncoderDecoder) + { + return pEncoderDecoder; + } } - - pEncoderDecoder = _IcuEncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); - if (pEncoderDecoder) + else if (encodingFrom.Contains(L"GSM") == true) { - return pEncoderDecoder; + pEncoderDecoder = _GsmEncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); + if (pEncoderDecoder) + { + return pEncoderDecoder; + } } - - pEncoderDecoder = _GsmEncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); - if (pEncoderDecoder) + else if (encodingFrom.Contains(L"ISO-8859-16") == true) { - return pEncoderDecoder; + pEncoderDecoder = _Iso885916EncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); + if (pEncoderDecoder) + { + return pEncoderDecoder; + } } - - pEncoderDecoder = _Iso885916EncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); - if (pEncoderDecoder) + else { - return pEncoderDecoder; + pEncoderDecoder = _IcuEncodingCore::GetEncodingCoreImplN(encodingFrom, encodingTo); + if (pEncoderDecoder) + { + return pEncoderDecoder; + } } return null; -- 2.7.4