diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-12-30 19:04:35 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2016-01-26 21:30:21 +0100 |
| commit | ab4264482fd8003068a0fbc10ef19662e5f5eae1 (patch) | |
| tree | 17f9c8e7ca5a03da90375f83808fb757e5386269 /vcl | |
| parent | a5bbe614d5166883ff3a5399bf2a29877f34f7af (diff) | |
sal_uIntPtr/sal_uLong to sal_uInt32 for number of printed copies
Change-Id: Ib91ef6fa9b52b0e7c968767a2c19b043c0797d5f
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salprn.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/genprn.h | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/print3.cxx | 11 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index d70ac368b0fd..0e4debbb0fcb 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -95,7 +95,7 @@ public: virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, - sal_uLong nCopies, + sal_uInt32 nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ) = 0; diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index 109946440e22..1fd8c41d9b0e 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -65,7 +65,7 @@ public: psp::PrinterJob m_aPrintJob; psp::JobData m_aJobData; psp::PrinterGfx m_aPrinterGfx; - sal_uIntPtr m_nCopies; + sal_uInt32 m_nCopies; bool m_bCollate; SalInfoPrinter* m_pInfoPrinter; @@ -76,7 +76,7 @@ public: virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, - sal_uIntPtr nCopies, + sal_uInt32 nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ) override; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index b839fdfa7166..2310eb2f88b3 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -536,18 +536,15 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer if ( IsJobActive() || IsPrinting() ) return false; - sal_uLong nCopies = mnCopyCount; + sal_uInt32 nCopies = mnCopyCount; bool bCollateCopy = mbCollateCopy; bool bUserCopy = false; if ( nCopies > 1 ) { - sal_uLong nDevCopy; - - if ( bCollateCopy ) - nDevCopy = GetCapabilities( PrinterCapType::CollateCopies ); - else - nDevCopy = GetCapabilities( PrinterCapType::Copies ); + const sal_uInt32 nDevCopy = GetCapabilities( bCollateCopy + ? PrinterCapType::CollateCopies + : PrinterCapType::Copies ); // need to do copies by hand ? if ( nCopies > nDevCopy ) diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 1724a80b3437..c398b8739c78 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -875,7 +875,7 @@ bool PspSalPrinter::StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, - sal_uLong nCopies, + sal_uInt32 nCopies, bool bCollate, bool bDirect, ImplJobSetup* pJobSetup ) |