diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-06 13:01:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-06 13:02:41 +0100 |
| commit | 7847a338f13071dcd591617f0e8d8fd69b2b0818 (patch) | |
| tree | 2c2f1b4f90b88dc6b086e361ec90f70afd81e37f /include/vcl/print.hxx | |
| parent | c47f7dfb3045b7b029859ea1fac80143b996945b (diff) | |
cancel doesn't cancel printing
regression from
commit e0ad036eed6b151ea81311fcf9ba46f1726b103c
Author: Luboš Luňák <l.lunak@collabora.com>
Date: Thu Feb 19 16:39:06 2015 +0100
mailmerge doesn't need to use the singlefile technique for printing
Change-Id: Ib1a7ae3033c03d13ba930cb6b94d85bd8041334c
Diffstat (limited to 'include/vcl/print.hxx')
| -rw-r--r-- | include/vcl/print.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index e6d3b28c1638..7fe9e7926d71 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -408,7 +408,7 @@ public: // These 3 together are more modular PrintJob(), allowing printing more documents as one print job // by repeated calls to ExecutePrintJob(). Used by mailmerge. - static void PreparePrintJob( std::shared_ptr<vcl::PrinterController> i_pController, + static bool PreparePrintJob( std::shared_ptr<vcl::PrinterController> i_pController, const JobSetup& i_rInitSetup ); static bool ExecutePrintJob( std::shared_ptr<vcl::PrinterController> i_pController ); static void FinishPrintJob( std::shared_ptr<vcl::PrinterController> i_pController ); |