summaryrefslogtreecommitdiff
path: root/svx/source/gallery2/galmisc.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-12 14:55:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-13 07:49:35 +0100
commit4c0026725cd6485f0024fd305dc35b8948c06e81 (patch)
tree245cc30462ffc1dbf66cf7cc58f19252b327579a /svx/source/gallery2/galmisc.cxx
parentfd88c4b45426600bd09fc47f8df9ac1cb8030e95 (diff)
sal_uIntPtr->sal_Int32 in GalleryProgress
to match the underlying type on mxProgressBar->setValue Change-Id: Ib04569235830f16b6507180e0f27816f8cfc50ff Reviewed-on: https://gerrit.libreoffice.org/46347 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/gallery2/galmisc.cxx')
-rw-r--r--svx/source/gallery2/galmisc.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index a410aa30d8f2..7e5c291d3491 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -369,10 +369,11 @@ GalleryProgress::~GalleryProgress()
{
}
-void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
+void GalleryProgress::Update( sal_Int32 nVal, sal_Int32 nMaxVal )
{
if( mxProgressBar.is() && nMaxVal )
- mxProgressBar->setValue( std::min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
+ mxProgressBar->setValue( std::min<sal_Int32>( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE,
+ GALLERY_PROGRESS_RANGE ) );
}