summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2015-10-27 11:06:22 +0100
committerKatarina Behrens <Katarina.Behrens@cib.de>2015-10-27 12:25:21 +0000
commitf8d0dc09e15b36ae83a5e89280d1f7fbc01da48b (patch)
tree83d19d30d41a87bfdebb441fc8f297dc4d9ebacb /include
parentd4484f726a78f1c2839ac0b4d0181e3e4357396c (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. Change-Id: I4a3abf23a711ad98556c0b608a07ef0a91e77e2b Reviewed-on: https://gerrit.libreoffice.org/19623 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/ppdparser.hxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 43dec319ff80..3f8f9c719bcb 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 };
@@ -95,6 +96,7 @@ public:
const PPDValue* getValue( const OUString& rOption ) const;
const PPDValue* getValueCaseInsensitive( const OUString& rOption ) const;
const PPDValue* getDefaultValue() const { return m_pDefaultValue; }
+ const OUString& getGroup() const { return m_aGroup; }
const OUString& getKey() const { return m_aKey; }
bool isUIKey() const { return m_bUIOption; }
@@ -182,7 +184,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 );