diff options
| author | Martin Hosken <martin_hosken@sil.org> | 2019-03-25 13:44:10 +0700 |
|---|---|---|
| committer | Martin Hosken <martin_hosken@sil.org> | 2019-03-26 05:00:33 +0100 |
| commit | 36eb092bed8528eaca295d817ec77fc9a2b73339 (patch) | |
| tree | 038c415790db2cd12cb7947659945429a811d0d9 /vcl/source/font/Feature.cxx | |
| parent | 4ca9db953d59d93ce8e3a54a36d23ed52b9c62a9 (diff) | |
Allow irregular feature value structures in feature dialog
Change-Id: I92df2d47bebb0b0af38f3527881ac65a11d1bb98
Reviewed-on: https://gerrit.libreoffice.org/69643
Tested-by: Jenkins
Reviewed-by: Martin Hosken <martin_hosken@sil.org>
Diffstat (limited to 'vcl/source/font/Feature.cxx')
| -rw-r--r-- | vcl/source/font/Feature.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/source/font/Feature.cxx b/vcl/source/font/Feature.cxx index 2516da2bc4c0..4be8152d4bc7 100644 --- a/vcl/source/font/Feature.cxx +++ b/vcl/source/font/Feature.cxx @@ -100,10 +100,12 @@ FeatureDefinition::FeatureDefinition() FeatureDefinition::FeatureDefinition(uint32_t nCode, OUString const& rDescription, FeatureParameterType eType, - std::vector<FeatureParameter> const& rEnumParameters) + std::vector<FeatureParameter> const& rEnumParameters, + uint32_t nDefault) : m_sDescription(rDescription) , m_pDescriptionID(nullptr) , m_nCode(nCode) + , m_nDefault(nDefault) , m_eType(eType) , m_aEnumParameters(rEnumParameters) { @@ -114,6 +116,7 @@ FeatureDefinition::FeatureDefinition(uint32_t nCode, const char* pDescriptionID, : m_pDescriptionID(pDescriptionID) , m_sNumericPart(rNumericPart) , m_nCode(nCode) + , m_nDefault(0) , m_eType(FeatureParameterType::BOOL) { } @@ -122,6 +125,7 @@ FeatureDefinition::FeatureDefinition(uint32_t nCode, const char* pDescriptionID, std::vector<FeatureParameter> aEnumParameters) : m_pDescriptionID(pDescriptionID) , m_nCode(nCode) + , m_nDefault(0) , m_eType(FeatureParameterType::ENUM) , m_aEnumParameters(std::move(aEnumParameters)) { @@ -157,6 +161,7 @@ FeatureParameterType FeatureDefinition::getType() const { return m_eType; } FeatureDefinition::operator bool() const { return m_nCode != 0; } +uint32_t FeatureDefinition::getDefault() const { return m_nDefault; } } // end font namespace } // end vcl namespace |