summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-07-10 23:47:36 +0200
committerTomaž Vajngerl <quikee@gmail.com>2018-07-11 08:26:32 +0200
commit28493a04f0fa63a76c096c62a3141d86edbac964 (patch)
treee4679d6037e081503aa2f5adcfffbb3e0325d989 /cui
parent877362dadf34c910365490ce53b2dcf902dab8cc (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 'cui')
-rw-r--r--cui/source/dialogs/FontFeaturesDialog.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 6f9543c13109..676f216e25ec 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -11,7 +11,6 @@
#include <FontFeaturesDialog.hxx>
#include <vcl/font/FeatureParser.hxx>
-#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
using namespace css;
@@ -34,7 +33,6 @@ VclPtr<ComboBox> makeEnumComboBox(vcl::Window* pParent,
{
VclPtr<ComboBox> aNameBox(
VclPtr<ComboBox>::Create(pParent, WB_TABSTOP | WB_DROPDOWN | WB_AUTOHSCROLL));
- aNameBox->InsertEntry(SvxResId(RID_SVXSTR_NONE));
for (vcl::font::FeatureParameter const& rParameter : rFeatureDefinition.getEnumParameters())
{
aNameBox->InsertEntry(rParameter.getDescription());