From 9f7a4f14a310628d0649c31d22c8ba8493443511 Mon Sep 17 00:00:00 2001 From: Kemal Ayhan Date: Mon, 30 Dec 2019 00:13:55 +0300 Subject: tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types Change-Id: If89f71675c4fbfaf0a4a2d24133ee3d3167d0836 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85964 Reviewed-by: Muhammet Kara Tested-by: Muhammet Kara --- svx/source/gallery2/galbrws1.cxx | 4 ++-- svx/source/gallery2/galobj.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index d7adffee9982..796586ebb995 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -135,7 +135,7 @@ GalleryBrowser1::GalleryBrowser1( mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); mpThemes->SetAccessibleName(SvxResId(RID_SVXSTR_GALLERYPROPS_GALTHEME)); - for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) + for( sal_uInt64 i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) ); ImplAdjustControls(); @@ -593,7 +593,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl, Button*, void) { OUString aNewTheme( SvxResId(RID_SVXSTR_GALLERY_NEWTHEME) ); OUString aName( aNewTheme ); - sal_uIntPtr nCount = 0; + sal_uInt16 nCount = 0; while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) ) { diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 23b1e3cda851..c8354334a041 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -177,7 +177,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const if( bIsThumbBmp ) { const SvStreamCompressFlags nOldCompressMode = rOut.GetCompressMode(); - const sal_uIntPtr nOldVersion = rOut.GetVersion(); + const sal_Int32 nOldVersion = rOut.GetVersion(); rOut.SetCompressMode( SvStreamCompressFlags::ZBITMAP ); rOut.SetVersion( SOFFICE_FILEFORMAT_50 ); -- cgit