summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-09-16 13:50:27 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-09-18 18:52:00 +0000
commit536cd9baa6b3eea7ddce9c0e69f9612aa0688144 (patch)
tree598114bebebfcfd617f1df3871e390f317ee8759
parent7b3ec856595cc52e8fec911ae420170a455d4888 (diff)
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@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index e7f3dd0032bd..8860dd9a9cc3 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