From e0ad036eed6b151ea81311fcf9ba46f1726b103c Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 19 Feb 2015 16:39:06 +0100 Subject: 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 --- include/sfx2/viewsh.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/sfx2') diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 31e2d6884a13..42cea7201da8 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -35,6 +35,7 @@ #include #include #include +#include class SfxBaseController; class Size; @@ -59,6 +60,7 @@ class Dialog; class Menu; class NotifyEvent; class SfxInPlaceClient; +namespace vcl { class PrinterController; } #define SFX_PRINTER_PRINTER 1 // without JOB SETUP => Temporary #define SFX_PRINTER_JOBSETUP 2 @@ -266,6 +268,9 @@ public: bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool, bool ); + // Like ExecPrint(), but only sets up for printing. Use Printer::ExecutePrintJob() and Printer::FinishPrintJob() afterwards. + void StartPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool, bool ); + std::shared_ptr< vcl::PrinterController > GetPrinterController() const; void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, bool ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier(); -- cgit