diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2011-01-27 16:53:34 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2011-01-27 16:53:34 +0100 |
commit | fc8b4b4b2ebe3d5183e00a07ba8721d5909c34ad (patch) | |
tree | 34da321814885c40a3e6267b9bba6cf1fba2d13f /sw/source/ui/uno/unomailmerge.cxx | |
parent | a8fec4fc9cfcbc0fbf21f5a118facd84baac60d4 (diff) | |
parent | 70fc69da2e9a673505a8e1236501ddf577efb64a (diff) |
CWS-TOOLING: integrate CWS tl84
Diffstat (limited to 'sw/source/ui/uno/unomailmerge.cxx')
-rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 256d5737f7f5..7a9cc3bceaee 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -712,11 +712,8 @@ uno::Any SAL_CALL SwXMailMerge::execute( uno::Reference< mail::XMailService > xInService; if (MailMergeType::PRINTER == nCurOutputType) { - SwPrintData aPrtData = *SW_MOD()->GetPrtOptions( FALSE ); IDocumentDeviceAccess* pIDDA = rSh.getIDocumentDeviceAccess(); - SwPrintData* pShellPrintData = pIDDA->getPrintData(); - if (pShellPrintData) - aPrtData = *pShellPrintData; + SwPrintData aPrtData( pIDDA->getPrintData() ); aPrtData.SetPrintSingleJobs( bCurSinglePrintJobs ); pIDDA->setPrintData( aPrtData ); // #i25686# printing should not be done asynchronously to prevent dangling offices |