diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-07 12:08:33 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-10 09:26:09 +0000 |
| commit | 2a1fe443a8343642292444be19cbd10700e7e01c (patch) | |
| tree | cfd32dbc81c691b056e7c730318503b63f74841c /include/vcl | |
| parent | 459bcc222f2aee52477cef8f94eb2789ff4ecd9a (diff) | |
Related tdf#91362: disable paper size & orientation selection
Unless 'Use only papersize from printer prefs' is toggled on,
whatever the user sets here doesn't have any effect on the actual
printing (page settings from the document are used instead). It is
misleading to have the user believe otherwise.
It was really challenging to have this one toggle get all the way
down through several layers of abstraction, though ...
Change-Id: If240084ca23b3946a92882a6ee47dbc161b3b86c
Reviewed-on: https://gerrit.libreoffice.org/16812
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/print.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/printerinfomanager.hxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index cc2e80d741bd..ce9dbba1e666 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -320,7 +320,7 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( vcl::Window* pWindow = NULL ); + bool Setup( vcl::Window* pWindow = NULL, bool bPapersizeFromSetup = false ); bool SetPrinterProps( const Printer* pPrinter ); // SetPrinterOptions is used internally only now diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index ec5c587838c9..52245c4b715a 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -50,6 +50,7 @@ struct PrinterInfo : JobData // a list of special features separated by ',' not used by psprint // but assigned from the outside (currently for "fax","pdf=","autoqueue","external_dialog") OUString m_aFeatures; + bool m_bPapersizeFromSetup; PrinterInfo() : JobData() |