[Libreoffice-commits] core.git: i18nlangtag/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 93e9f05c26e23cf99f80ebd55dc7c22335cad979
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 30 11:56:25 2013 +0200

    microoptimization
    
    Change-Id: I773262f018519f5816c029df3da92a9903e53165

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index e4ab25c..50c154b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -828,13 +828,13 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
         {
             // Check for country only if there is more than lll-Ssss-CC in tag
             // string, else we would had matched it already.
-            if (!rLocale.Country.isEmpty() && rLocale.Variant.getLength() > 11)
+            if (!aUpperCountry.isEmpty() && rLocale.Variant.getLength() > 11)
             {
                 for (const IsoLanguageScriptCountryEntry* pScriptEntry = pFirstScript;
                         pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
                 {
-                    if (pScriptEntry->startsInIgnoreAsciiCase( rLocale.Variant) &&
-                            rLocale.Country.equalsIgnoreAsciiCaseAscii( pScriptEntry->maCountry))
+                    if (aUpperCountry.equalsAscii( pScriptEntry->maCountry) &&
+                            pScriptEntry->startsInIgnoreAsciiCase( rLocale.Variant))
                         return pScriptEntry->getLocale();
                 }
             }