diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-11 17:42:46 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-11 17:45:19 +0100 |
| commit | fa8543c558d6402077b9f85ab60c6961e5d6949f (patch) | |
| tree | ea2271284123317b39353133819730cda2db9ca5 | |
| parent | eeef59d94cd358916d1defdb7925e25c740ac8d0 (diff) | |
sw: MacOSX has CUPS but no psp::PrinterInfoManager
... so disable the we-can-queue-jobs-better-than-cups code on Mac.
Change-Id: If91eb96c5d7bd27fe162bd233ee958e581de23fc
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 448c23ad35e9..74ecf73ad75a 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 } |