diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-12-21 23:09:33 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-01-02 04:04:15 +0100 |
| commit | eacf6ae77ca7815f80addb90d066a7aa4c6c6a53 (patch) | |
| tree | fa3e0e446a0161543f212b1e31bd4c43e99462df /include | |
| parent | 386b3ceeacf1b8c20d2f777c40f3630dad5ae998 (diff) | |
tdf#79077: Mildly improved user experience
Reviewed-on: https://gerrit.libreoffice.org/46936
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 2113282cf957943d08999e7c7071a76734cf2c00)
Conflicts:
include/vcl/print.hxx
vcl/inc/jobset.h
vcl/inc/printerinfomanager.hxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/print.cxx
vcl/source/gdi/print3.cxx
vcl/uiconfig/ui/printerpaperpage.ui
vcl/unx/generic/print/genprnpsp.cxx
Change-Id: I3cf63d06c3c238ed936a8dd0287cfbe02e8e39be
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/print.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/printerinfomanager.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/prntypes.hxx | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 15d36be5cdb2..f0d307f72b8a 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -293,7 +293,8 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( vcl::Window* pWindow = nullptr ); + bool Setup( vcl::Window* pWindow = nullptr, + PrinterSetupMode eMode = PrinterSetupMode::DocumentGlobal ); bool SetPrinterProps( const Printer* pPrinter ); /** SetPrinterOptions is used internally only now diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index f548bf239e91..041b3799338f 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -26,6 +26,7 @@ #include <vcl/dllapi.h> #include <vcl/helper.hxx> #include <vcl/jobdata.hxx> +#include <vcl/prntypes.hxx> #include <osl/file.hxx> #include <cstdio> @@ -50,11 +51,10 @@ 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; + PrinterSetupMode meSetupMode; PrinterInfo() : JobData() - , m_bPapersizeFromSetup(false) {} }; diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx index 06cf3f800196..fccb9b6ab87c 100644 --- a/include/vcl/prntypes.hxx +++ b/include/vcl/prntypes.hxx @@ -84,6 +84,12 @@ enum class PrinterCapType UsePullModel = 12, }; +enum class PrinterSetupMode +{ + SingleJob = 0, + DocumentGlobal = 1 +}; + #endif // INCLUDED_VCL_PRNTYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |