Rebased ref, commits from common ancestor:
commit fb26f7993400b43b67b82b726b3de715677158f0
Author: Khaled Hosny <[email protected]>
Date: Thu Sep 22 19:48:10 2016 +0200
Always pass BCP 47 tags to HarfBuzz
This is what it is expecting anyway, no need to special case it for
Chinese.
Change-Id: I6732412375d19816b599005d78abd796f67599ee
diff --git a/vcl/source/gdi/CommonSalLayout.cxx
b/vcl/source/gdi/CommonSalLayout.cxx
index ea4e5f9..8cb1dc9 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -379,7 +379,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
aHbScript = it->maScript;
// hb_language_from_string() accept ISO639-3 language tag except
for Chinese.
LanguageTag &rTag = rArgs.maLanguageTag;
- OString sLanguage = OUStringToOString(
MsLangId::isChinese(rTag.getLanguageType()) ?
rTag.getBcp47():rTag.getLanguage() , RTL_TEXTENCODING_UTF8 );
+ OString sLanguage = OUStringToOString(rTag.getBcp47(),
RTL_TEXTENCODING_ASCII_US);
int nHbFlags = HB_BUFFER_FLAGS_DEFAULT;
if (nMinRunPos == 0)
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
