sw/source/uibase/dbui/dbmgr.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit fa8543c558d6402077b9f85ab60c6961e5d6949f
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Mar 11 17:42:46 2015 +0100
sw: MacOSX has CUPS but no psp::PrinterInfoManager
... so disable the we-can-queue-jobs-better-than-cups code on Mac.
Change-Id: If91eb96c5d7bd27fe162bd233ee958e581de23fc
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 448c23a..74ecf73 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -136,7 +136,9 @@
#include <boost/scoped_ptr.hpp>
#include <config_cups.h>
+#if ENABLE_CUPS && !defined(MACOSX)
#include <vcl/printerinfomanager.hxx>
+#endif
using namespace ::osl;
@@ -838,7 +840,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
// and send them to CUPS only as one job at the very end. Therefore,
with CUPS, it's ok
// to use the faster mode. As I have no idea about other platforms,
keep them using
// the slower singlefile mode (or feel free to check them, or rewrite
the printing code).
-#if ENABLE_CUPS
+#if ENABLE_CUPS && !defined(MACOSX)
bCreateSingleFile =
!psp::PrinterInfoManager::get().supportsBatchPrint();
#else
bCreateSingleFile = true;
@@ -1215,7 +1217,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
SfxPrinter* pDocPrt =
pWorkView->GetPrinter(false);
JobSetup aJobSetup = pDocPrt ?
pDocPrt->GetJobSetup() : pWorkView->GetJobSetup();
Printer::PreparePrintJob(
pWorkView->GetPrinterController(), aJobSetup );
-#if ENABLE_CUPS
+#if ENABLE_CUPS && !defined(MACOSX)
psp::PrinterInfoManager::get().startBatchPrint();
#endif
}
@@ -1379,7 +1381,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
if( rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER )
{
Printer::FinishPrintJob(
pWorkView->GetPrinterController());
-#if ENABLE_CUPS
+#if ENABLE_CUPS && !defined(MACOSX)
psp::PrinterInfoManager::get().flushBatchPrint();
#endif
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
