summaryrefslogtreecommitdiff
path: root/stoc/Library_javavm.mk
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-10-25 13:10:07 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-10-25 11:30:12 +0000
commit9b09a217c79e8a35fc4de54c89ef49fbf8f72752 (patch)
tree90fb147a0b659ee13cc1fcac3556b45c5c3f255b /stoc/Library_javavm.mk
parent88fb9d8f0aae0030fac75156f78818affae4298f (diff)
Resolves: #i86470# Wrong Java locale when using "nl" and "fr"
Languages don't always have a country; if there is no "-" separating language and country in the ooLocale registry value, use the entire value as the language. Initial finding by Damjan Jovanovic. However, LibreOffice knows BCP47 language tags so that needs a different approach. (cherry picked from commit d61ab2b5a0e35d55cb001e139be791420245bf35) Change-Id: I69331951372bda1c1cec80cfd10d5839d8f4b823 Reviewed-on: https://gerrit.libreoffice.org/30154 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'stoc/Library_javavm.mk')
-rw-r--r--stoc/Library_javavm.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index a45518c240b2..fc4428deff3e 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Library_use_udk_api,javavm))
$(eval $(call gb_Library_use_libraries,javavm,\
cppu \
cppuhelper \
+ i18nlangtag \
jvmaccess \
jvmfwk \
sal \