From d5728f42c8298a4c47e456c657a7d54c4c4a3a86 Mon Sep 17 00:00:00 2001 From: Hokwon Song Date: Tue, 16 Jul 2013 06:04:53 +0000 Subject: [PATCH] Revert "Fix prevent defect for locales" This reverts commit 21e1779e74ebc6b4e2deb4d667ffbcaaf0fa99d8 Change-Id: I4f62f288c7c5c3e92297d4d12bb91864e69609eb --- src/locales/FLclLocale.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/FLclLocale.cpp b/src/locales/FLclLocale.cpp index 5e3af15..03ce769 100644 --- a/src/locales/FLclLocale.cpp +++ b/src/locales/FLclLocale.cpp @@ -1045,9 +1045,9 @@ Locale::TwoLetterLanguageCodeStringToLanguageCode(const String& languageCodeStri { int index = -1; - result r = languageCodeString.IndexOf(L"-", 0, index); + languageCodeString.IndexOf(L"-", 0, index); - if ((r == E_SUCCESS) && (languageCodeString.GetLength() == 2 || index == 2)) + if (languageCodeString.GetLength() == 2 || index == 2) { std::unique_ptr pLangStr (_StringConverter::CopyToCharArrayN(languageCodeString)); return StringToLanguageCode(_LocaleImpl::Get3LetterLanguageCodeString(pLangStr.get())); -- 2.7.4