mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS kprinter (1.44.16); FILE MERGED

Browse Source 
2007/11/12 13:27:30 pl 1.44.16.1: #i83505# implement external print dialog on a queue
This commit is contained in:
Kurt Zenker
2007-12-12 13:56:41 +00:00
parent 9ec3893575
commit b0f4ddffa1
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
psprint/source/printergfx/printerjob.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: printerjob.cxx,v $ * $RCSfile: printerjob.cxx,v $
* *
* $Revision: 1.44 $ * $Revision: 1.45 $
* *
* last change: $Author: hr $ $Date: 2007-08-02 14:58:21 $ * last change: $Author: kz $ $Date: 2007-12-12 14:56:41 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -230,8 +230,9 @@ PrinterJob::GetCurrentPageBody ()
*/ */
PrinterJob::PrinterJob () : PrinterJob::PrinterJob () :
mpJobHeader (NULL), mpJobHeader( NULL ),
mpJobTrailer (NULL) mpJobTrailer( NULL ),
m_bQuickJob( false )
{ {
} }
@@ -405,9 +406,11 @@ PrinterJob::StartJob (
const rtl::OUString& rJobName, const rtl::OUString& rJobName,
const rtl::OUString& rAppName, const rtl::OUString& rAppName,
const JobData& rSetupData, const JobData& rSetupData,
PrinterGfx* pGraphics PrinterGfx* pGraphics,
bool bIsQuickJob
) )
{ {
m_bQuickJob = bIsQuickJob;
mnMaxWidthPt = mnMaxHeightPt = 0; mnMaxWidthPt = mnMaxHeightPt = 0;
m_pGraphics = pGraphics; m_pGraphics = pGraphics;
InitPaperSize (rSetupData); InitPaperSize (rSetupData);
@@ -574,7 +577,7 @@ PrinterJob::EndJob ()
else else
{ {
PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get (); PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get ();
pDestFILE = rPrinterInfoManager.startSpool( m_aLastJobData.m_aPrinterName ); pDestFILE = rPrinterInfoManager.startSpool( m_aLastJobData.m_aPrinterName, m_bQuickJob );
if (pDestFILE == NULL) if (pDestFILE == NULL)
return sal_False; return sal_False;
} }
@@ -1177,7 +1180,10 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob )
} }
bool bSuccess = true; bool bSuccess = true;
if (rJob.m_nCopies > 1) // in case of external print dialog the number of copies is prepended
// to the job, let us not complicate things by emitting our own copy count
bool bExternalDialog = PrinterInfoManager::get().checkFeatureToken( GetPrinterName(), "external_dialog" );
if( ! bExternalDialog && rJob.m_nCopies > 1 )
{ {
// setup code // setup code
ByteString aLine( "/#copies " ); ByteString aLine( "/#copies " );