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

[Eike Rathke]

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

New commits:
commit b481d42e56c9585a3a6018ee851dcca41e89666f
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Apr 21 11:46:51 2016 +0200

    also exclude the "specific English" table from mapping to LanguageTag
    
    ... otherwise entering a tag for such combination would result in a
    different locale instead of an on-the-fly assignment.
    
    Change-Id: I0c1b2005298cb39f98cf816d4765ce21a5cbc9bc

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 6add6e3..09d1b87 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1285,16 +1285,16 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
                     pFirstLang = pEntry;
             }
         }
-    }
 
-    // some eng countries should be mapped to a specific english language
-    if ( aLowerLang == "en" )
-    {
-        for (const IsoLangEngEntry* pEngEntry = aImplIsoLangEngEntries;
-                pEngEntry->mnLang != LANGUAGE_DONTKNOW; ++pEngEntry)
+        // some eng countries should be mapped to a specific english language
+        if ( aLowerLang == "en" )
         {
-            if ( aUpperCountry.equalsAscii( pEngEntry->maCountry ) )
-                return pEngEntry->mnLang;
+            for (const IsoLangEngEntry* pEngEntry = aImplIsoLangEngEntries;
+                    pEngEntry->mnLang != LANGUAGE_DONTKNOW; ++pEngEntry)
+            {
+                if ( aUpperCountry.equalsAscii( pEngEntry->maCountry ) )
+                    return pEngEntry->mnLang;
+            }
         }
     }