From 19787042b1f139cb9c366801d283c6c0227e85e6 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 24 Aug 2022 00:26:10 +0200 Subject: FeatureCollector: Get feature labels for ssXX/cvXX features from the font MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the font provides feature labels for ssXX/cvXX features, fetch and use them. Switches also to using the UI language not locale for finding labels as the UI language is what controls the UI localization. Change-Id: Ic7eeae9df25692e7f2924b2db65905666999c904 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138748 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- vcl/source/outdev/font.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/source/outdev') diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index e24d6ac014db..dc5ca50abaf9 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -170,9 +170,9 @@ bool OutputDevice::GetFontFeatures(std::vector& rFontFeature if (!pHbFace) return false; - const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); + const LanguageTag& rOfficeLanguage = Application::GetSettings().GetUILanguageTag(); - vcl::font::FeatureCollector aFeatureCollector(pHbFace, rFontFeatures, eOfficeLanguage); + vcl::font::FeatureCollector aFeatureCollector(pHbFace, rFontFeatures, rOfficeLanguage); aFeatureCollector.collect(); return true; -- cgit