diff options
| author | Khaled Hosny <khaled@aliftype.com> | 2022-08-24 00:26:10 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-08-25 13:03:55 +0200 |
| commit | 19787042b1f139cb9c366801d283c6c0227e85e6 (patch) | |
| tree | 8a51f8e03f6d1a0cabb639376dd6b455a294149a /vcl/source/outdev | |
| parent | 7581fcde3c6a8d098a37b2c89c74e54696d4c346 (diff) | |
FeatureCollector: Get feature labels for ssXX/cvXX features from the font
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 <quikee@gmail.com>
Diffstat (limited to 'vcl/source/outdev')
| -rw-r--r-- | vcl/source/outdev/font.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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<vcl::font::Feature>& 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; |