summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYash Srivastav <yash111998@gmail.com>2017-07-27 08:11:34 +0530
committerCaolán McNamara <caolanm@redhat.com>2017-09-12 10:54:52 +0200
commit7fbf98d99737ac916cc2dc374f3139e2ea81e47b (patch)
treef67793fd3d086d0a5c39ad45cc3b510ce1dffb6d /include
parentd2335e83c3e798cc72a9cf3b3e31eeefe4b5a39c (diff)
Add Common Printing Dialog Functionality
Summary: These set of commits add support for the Common Printing Dialog Backends being developed as part of GSoC'17. All backends exist as dbus-services which can be queried for printers, their options, etc. Test Plan: Firstly, without adding any CPD backend, LO printing should work as it works now with graceful fallback to CUPS. Next, we need to install a backend. The backend providing CUPS interface is at git@github.com:NilanjanaLodh/PrintDialog_Backend.git See README.md for installation instructions. After this, run LO and existing CUPS Printers should show up. Also printing does send a job to cups which can be seen at: http://localhost:631/jobs?which_jobs=completed Due to LO shutdown not being handled properly currently, the backend might need to be killed via `pkill print_backend_cups` Future Plans: * Fix shutdown actions. Change-Id: I3bdea5d3272ec4c9c0dfe510f5848fcb398b4b14 Reviewed-on: https://gerrit.libreoffice.org/40565 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/ppdparser.hxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 9212516fc8e5..ecbda153af79 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -60,6 +60,7 @@ struct VCL_DLLPUBLIC PPDValue
class VCL_DLLPUBLIC PPDKey
{
friend class PPDParser;
+ friend class CPDManager;
typedef std::unordered_map< OUString, PPDValue, OUStringHash > hash_type;
typedef std::vector< PPDValue* > value_type;
@@ -120,6 +121,7 @@ class VCL_DLLPUBLIC PPDParser
{
friend class PPDContext;
friend class CUPSManager;
+ friend class CPDManager;
friend class PPDCache;
typedef std::unordered_map< OUString, PPDKey*, OUStringHash > hash_type;
@@ -174,6 +176,7 @@ private:
PPDTranslator* m_pTranslator;
PPDParser( const OUString& rFile );
+ PPDParser( const OUString& rFile, std::vector<PPDKey*> keys );
~PPDParser();
void parseOrderDependency(const OString& rLine);