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/sfx2 | |
| 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/sfx2')
| -rw-r--r-- | include/sfx2/viewsh.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
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 <tools/gen.hxx> #include <tools/errcode.hxx> #include <vcl/jobset.hxx> +#include <boost/shared_ptr.hpp> 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(); |