From 984a0c79cb57789cff6416900fc363eefead44db Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 25 Feb 2019 14:49:41 +0200 Subject: sal_uIntPtr->sal_uInt32 inSalClipRegion::BeginSetClipRegion sal_uInt32 seems reasonable given that this is the number of rectanges in an image. And then convert all of the other BeginSetClipRegion methods to use sal_uInt32 too. Change-Id: I85a712ec823662ac30f3859051e2b974fb99775e Reviewed-on: https://gerrit.libreoffice.org/68343 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/unx/generic/window/salframe.cxx | 2 +- vcl/unx/generic/window/salobj.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/unx/generic') diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 59e5370736f1..9cacc0a886b0 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -4107,7 +4107,7 @@ void X11SalFrame::ResetClipRegion() op, ordering ); } -void X11SalFrame::BeginSetClipRegion( sal_uIntPtr /*nRects*/ ) +void X11SalFrame::BeginSetClipRegion( sal_uInt32 /*nRects*/ ) { m_vClipRectangles.clear(); } diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index c406b152e3a4..d253d08ce5ba 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -188,7 +188,7 @@ SalClipRegion::~SalClipRegion() } void -SalClipRegion::BeginSetClipRegion( sal_uLong nRects ) +SalClipRegion::BeginSetClipRegion( sal_uInt32 nRects ) { ClipRectangleList.reset( new XRectangle[nRects] ); numClipRectangles = 0; @@ -283,7 +283,7 @@ X11SalObject::ResetClipRegion() } void -X11SalObject::BeginSetClipRegion( sal_uLong nRectCount ) +X11SalObject::BeginSetClipRegion( sal_uInt32 nRectCount ) { maClipRegion.BeginSetClipRegion ( nRectCount ); } -- cgit