diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2015-02-19 16:39:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-11 16:21:43 +0100 |
| commit | e0ad036eed6b151ea81311fcf9ba46f1726b103c (patch) | |
| tree | 9508f293ab9e4af6f6132dd5ac6827a35b00530f /include/vcl | |
| parent | 1ef9952e804da953706cc514564db92a4a4a07b5 (diff) | |
mailmerge doesn't need to use the singlefile technique for printing
It should be sufficient for every record to just update the fields and print
the document. The printing code apparently rather expects to do the printing
in one go, so split the functions up there.
Conflicts:
include/sfx2/viewsh.hxx
include/vcl/print.hxx
sfx2/source/view/viewprn.cxx
sw/source/uibase/dbui/dbmgr.cxx
sw/source/uibase/uno/unomailmerge.cxx
vcl/source/gdi/print3.cxx
Change-Id: I4d17c703b3220f47609fc4b054ce048b299a0c92
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/print.hxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index b0dd3f07afd3..d74976981bd8 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -405,9 +405,16 @@ public: const Image&, sal_uInt16 ) SAL_OVERRIDE; + // 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, + const JobSetup& i_rInitSetup ); + static bool ExecutePrintJob( std::shared_ptr<vcl::PrinterController> i_pController ); + static void FinishPrintJob( std::shared_ptr<vcl::PrinterController> i_pController ); + // implementation detail of PrintJob being asynchronous // not exported, not usable outside vcl - static void SAL_DLLPRIVATE ImplPrintJob( const std::shared_ptr<vcl::PrinterController>& i_pController, + static void SAL_DLLPRIVATE ImplPrintJob( std::shared_ptr<vcl::PrinterController> i_pController, const JobSetup& i_rInitSetup ); }; |