diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-12-30 14:28:26 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2016-01-26 21:30:20 +0100 |
| commit | a5bbe614d5166883ff3a5399bf2a29877f34f7af (patch) | |
| tree | d51f14fddc6e84edbd96013fcc4044ee9ad14ad8 /vcl/unx | |
| parent | 95e2ba744a0ec7b5877ded01eb66bec62e7388ac (diff) | |
Convert SAL_JOBSET_* defines to new JobSetFlags enum class
Change-Id: Id59dd767c09c0757b6c94c7dd4b3e832f11cf615
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 521c5f0d17cd..1724a80b3437 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -557,7 +557,7 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) PrinterInfo aInfo( rManager.getPrinterInfo( pJobSetup->maPrinterName ) ); if ( pJobSetup->mpDriverData ) { - SetData( ~0, pJobSetup ); + SetData( JobSetFlags::ALL, pJobSetup ); JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aInfo ); } aInfo.m_bPapersizeFromSetup = pJobSetup->mbPapersizeFromSetup; @@ -590,7 +590,7 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) { if( pJobSetup->mpDriverData ) - return SetData( ~0, pJobSetup ); + return SetData( JobSetFlags::ALL, pJobSetup ); copyJobDataToJobSetup( pJobSetup, m_aJobData ); @@ -602,7 +602,7 @@ bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) // Only the data must be changed, where the bit // in nGetDataFlags is set bool PspSalInfoPrinter::SetData( - sal_uLong nSetDataFlags, + JobSetFlags nSetDataFlags, ImplJobSetup* pJobSetup ) { JobData aData; @@ -614,7 +614,7 @@ bool PspSalInfoPrinter::SetData( const PPDValue* pValue; // merge papersize if necessary - if( nSetDataFlags & SAL_JOBSET_PAPERSIZE ) + if( nSetDataFlags & JobSetFlags::PAPERSIZE ) { OUString aPaper; @@ -644,7 +644,7 @@ bool PspSalInfoPrinter::SetData( } // merge paperbin if necessary - if( nSetDataFlags & SAL_JOBSET_PAPERBIN ) + if( nSetDataFlags & JobSetFlags::PAPERBIN ) { pKey = aData.m_pParser->getKey( OUString("InputSlot") ); if( pKey ) @@ -664,11 +664,11 @@ bool PspSalInfoPrinter::SetData( } // merge orientation if necessary - if( nSetDataFlags & SAL_JOBSET_ORIENTATION ) + if( nSetDataFlags & JobSetFlags::ORIENTATION ) aData.m_eOrientation = pJobSetup->meOrientation == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait; // merge duplex if necessary - if( nSetDataFlags & SAL_JOBSET_DUPLEXMODE ) + if( nSetDataFlags & JobSetFlags::DUPLEXMODE ) { pKey = aData.m_pParser->getKey( OUString("Duplex") ); if( pKey ) |