[Libreoffice-commits] core.git: vcl/inc vcl/win

[Julien Nabet (via logerrit)]

 vcl/inc/win/salprn.h   |    2 +-
 vcl/win/gdi/salprn.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8cd8cdcfa54ca34dc6365a398e3c69cbfc685891
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Sep 10 09:38:36 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Sep 10 13:36:31 2020 +0200

    tdf#75280: Convert some inappropriate use of sal_uIntPtr (+sal_uLong) (vcl)
    
    Change-Id: I8708cb825fbfe8de201a2025b7f988a1db9302ab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102361
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index c0c6e7fb7932..44b88525812e 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -78,7 +78,7 @@ public:
     WinSalPrinter*          mpNextPrinter;          // next printing printer
     HDC                     mhDC;                   // printer hdc
     SalPrinterError         mnError;                // error code
-    sal_uIntPtr             mnCopies;               // copies
+    sal_uInt32              mnCopies;               // copies
     bool                    mbCollate;              // collated copies
     bool                    mbAbort;                // Job Aborted
 
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 3f27d999d845..9d205b1d9daf 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -1319,7 +1319,7 @@ static BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ )
     return TRUE;
 }
 
-static DEVMODEW const * ImplSalSetCopies( DEVMODEW const * pDevMode, sal_uLong nCopies, bool bCollate )
+static DEVMODEW const * ImplSalSetCopies( DEVMODEW const * pDevMode, sal_uInt32 nCopies, bool bCollate )
 {
     if ( pDevMode && (nCopies > 1) )
     {