diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2015-10-27 11:06:22 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-10-29 13:08:58 +0100 |
commit | 958aea4736f45cff8bd4907b726d4347035f7c3a (patch) | |
tree | 6ea07071bdae4475e45a45bd0326c13eecf5dfe8 /include | |
parent | 651d7492b40f3000d636560e73d3e16313219023 (diff) |
tdf#94022 Print dialog: hide Installable Options
Options specified in PPD files can be grouped using the
keywords "OpenGroup" and "CloseGroup".
The keyword "InstallableOptions" is used as a group name
for a group containing options that define
optional hardware features of the printer that can
be present or not (s. section 5.4 in version 4.3 of
the PPD specification).
As they are not print job specific, it is recommended
not to show them in the print dialog.
To be able to distinguish those options, the
PPD group name was added as an attribute to the PPDKey
class.
Reviewed-on: https://gerrit.libreoffice.org/19623
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit f8d0dc09e15b36ae83a5e89280d1f7fbc01da48b)
Conflicts:
include/vcl/ppdparser.hxx
Change-Id: I4a3abf23a711ad98556c0b608a07ef0a91e77e2b
Reviewed-on: https://gerrit.libreoffice.org/19630
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 2f03a169d2311ed4337103d19f33173e997d0f40)
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/ppdparser.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 71cc2105006a..02fb83a730cb 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -71,6 +71,7 @@ class VCL_DLLPUBLIC PPDKey const PPDValue* m_pDefaultValue; bool m_bQueryValue; PPDValue m_aQueryValue; + OUString m_aGroup; public: enum UIType { PickOne, PickMany, Boolean }; @@ -96,6 +97,7 @@ public: const PPDValue* getValueCaseInsensitive( const OUString& rOption ) const; const PPDValue* getDefaultValue() const { return m_pDefaultValue; } const PPDValue* getQueryValue() const { return m_bQueryValue ? &m_aQueryValue : NULL; } + const OUString& getGroup() const { return m_aGroup; } const OUString& getKey() const { return m_aKey; } bool isUIKey() const { return m_bUIOption; } @@ -184,7 +186,7 @@ private: ~PPDParser(); void parseOrderDependency(const OString& rLine); - void parseOpenUI(const OString& rLine); + void parseOpenUI(const OString& rLine, const OString& rPPDGroup); void parseConstraint(const OString& rLine); void parse( std::list< OString >& rLines ); |