diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-07-10 23:47:36 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-07-11 08:26:32 +0200 |
| commit | 28493a04f0fa63a76c096c62a3141d86edbac964 (patch) | |
| tree | e4679d6037e081503aa2f5adcfffbb3e0325d989 /vcl/inc | |
| parent | 877362dadf34c910365490ce53b2dcf902dab8cc (diff) | |
font feat: prioritize Graphite descriptions, use UI lang., fixes
When collecting font feature description do prioritize Graphite
collected descriptions over OT. This is important for descriptions
for ssxx and cvxx only contain general description and not what
exactly they do.
When collecting for Graphite use the UI language for descriptions.
Fix gathering the descriptions with graphite to include all of
the descriptions available.
Change-Id: I6b3b92eb160fc3fd70214edf0d37095865f9c563
Reviewed-on: https://gerrit.libreoffice.org/57250
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/font/FeatureCollector.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/inc/font/FeatureCollector.hxx b/vcl/inc/font/FeatureCollector.hxx index 4e918c48e334..6c278ca15188 100644 --- a/vcl/inc/font/FeatureCollector.hxx +++ b/vcl/inc/font/FeatureCollector.hxx @@ -14,6 +14,7 @@ #include <vcl/font/Feature.hxx> #include <o3tl/make_unique.hxx> #include <hb.h> +#include <i18nlangtag/lang.h> namespace vcl { @@ -24,11 +25,14 @@ class FeatureCollector private: hb_face_t* m_pHbFace; std::vector<vcl::font::Feature>& m_rFontFeatures; + LanguageType m_eLanguageType; public: - FeatureCollector(hb_face_t* pHbFace, std::vector<vcl::font::Feature>& rFontFeatures) + FeatureCollector(hb_face_t* pHbFace, std::vector<vcl::font::Feature>& rFontFeatures, + LanguageType eLanguageType) : m_pHbFace(pHbFace) , m_rFontFeatures(rFontFeatures) + , m_eLanguageType(eLanguageType) { } |