[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - i18nlangtag/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 536cd9baa6b3eea7ddce9c0e69f9612aa0688144
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 16 13:50:27 2014 +0200

    fdo#81357 no fallback for special codes without country
    
    Thanks to Justin Luth for the hint.
    
    Change-Id: I97bde18814368e589e2a1c275457489a0d7392d4
    (cherry picked from commit 3ff2e4dc1d0ba922e06f0d5c90c85fee33623784)
    Reviewed-on: https://gerrit.libreoffice.org/11472
    Reviewed-by: Matúš Kukan <matus.kukan at collabora.com>
    Tested-by: Matúš Kukan <matus.kukan at collabora.com>

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index e7f3dd0..8860dd9 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1097,6 +1097,10 @@ com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageS
                     case LANGUAGE_USER_LOJBAN:
                     case LANGUAGE_KASHMIRI:
                     case LANGUAGE_USER_KEYID:
+                    // And the special codes without country.
+                    case LANGUAGE_MULTIPLE:
+                    case LANGUAGE_UNDETERMINED:
+                    case LANGUAGE_NONE:
                         return getLocale( pEntry);  // may override
                     default:
                         ;   // nothing