Kaydet (Commit) 4c002672 authored tarafından Noel Grandin's avatar Noel Grandin

sal_uIntPtr->sal_Int32 in GalleryProgress

to match the underlying type on mxProgressBar->setValue

Change-Id: Ib04569235830f16b6507180e0f27816f8cfc50ff
Reviewed-on: https://gerrit.libreoffice.org/46347Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst fd88c4b4
...@@ -127,7 +127,7 @@ class SVX_DLLPUBLIC GalleryProgress ...@@ -127,7 +127,7 @@ class SVX_DLLPUBLIC GalleryProgress
GalleryProgress( GraphicFilter* pFilter = nullptr ); GalleryProgress( GraphicFilter* pFilter = nullptr );
~GalleryProgress(); ~GalleryProgress();
void Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal ); void Update( sal_Int32 nVal, sal_Int32 nMaxVal );
}; };
class Gallery; class Gallery;
......
...@@ -369,10 +369,11 @@ GalleryProgress::~GalleryProgress() ...@@ -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 ) 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 ) );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment