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

endSpool return value is effectively success flag, not job ID

Browse Source 
Change-Id: I5b96eeff80ca29f0f8f24ee6da7a2ca76cbb05ce
This commit is contained in:
Stephan Bergmann
2014-01-09 23:09:12 +01:00
parent 18915452d1
commit e632321483
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/vcl/printerinfomanager.hxx
View File

@@ -192,8 +192,8 @@ public:
// close the FILE* returned by startSpool and does the actual spooling // close the FILE* returned by startSpool and does the actual spooling
// set bBanner to "false" will attempt to suppress banner printing // set bBanner to "false" will attempt to suppress banner printing
// set bBanner to "true" will rely on the system default // set bBanner to "true" will rely on the system default
// returns a numerical job id // returns true on success
virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
// for spadmin: whether adding or removing a printer is possible // for spadmin: whether adding or removing a printer is possible
virtual bool addOrRemovePossible() const; virtual bool addOrRemovePossible() const;

2
vcl/generic/print/printerjob.cxx
View File

@@ -530,7 +530,7 @@ PrinterJob::EndJob ()
else else
{ {
PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get(); PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get();
if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, if (!rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName,
maJobTitle, pDestFILE, m_aDocumentJobData, true )) maJobTitle, pDestFILE, m_aDocumentJobData, true ))
{ {
bSuccess = sal_False; bSuccess = sal_False;

2
vcl/inc/cupsmgr.hxx
View File

@@ -77,7 +77,7 @@ public:
const char* authenticateUser( const char* ); const char* authenticateUser( const char* );
virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ); virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand );
virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
virtual void setupJobContextData( JobData& rData ); virtual void setupJobContextData( JobData& rData );
/// changes the info about a named printer /// changes the info about a named printer

2
vcl/null/printerinfomanager.cxx
View File

@@ -142,7 +142,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& /* rPrintername */, bool /
return NULL; return NULL;
} }
int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* /* pFile */, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ ) bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* /* pFile */, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ )
{ {
return true; return true;
} }

4
vcl/unx/generic/printer/cupsmgr.cxx
View File

@@ -638,7 +638,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
} }
} }
int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ) bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner )
{ {
OSL_TRACE( "endSpool: %s, %s, copy count = %d", OSL_TRACE( "endSpool: %s, %s, copy count = %d",
OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
@@ -697,7 +697,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit
cupsFreeOptions( nNumOptions, pOptions ); cupsFreeOptions( nNumOptions, pOptions );
} }
return nJobID; return nJobID != 0;
} }

2
vcl/unx/generic/printer/printerinfomanager.cxx
View File

@@ -966,7 +966,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickC
return popen (aShellCommand.getStr(), "w"); return popen (aShellCommand.getStr(), "w");
} }
int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* pFile, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ ) bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* pFile, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ )
{ {
return (0 == pclose( pFile )); return (0 == pclose( pFile ));
} }