diff options
| author | Yusuf Keten <ketenyusuf@gmail.com> | 2020-01-04 15:30:01 +0300 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-01-13 14:04:42 +0100 |
| commit | c7de89df5efc4b2af1f81c00befcc957a7e22ca6 (patch) | |
| tree | ea5f728a5e21199866058cba45807297b4f00d1c | |
| parent | d865a4ea712619eee64e76483dc7223404e43a2c (diff) | |
tdf#75280 Convert inappropriate use of sal_uIntPtr to better integer types
Change-Id: Ia45fb0bc882411fe0bfcd1e83932d187b4873ab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86214
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index aba17d40360b..1247d6cfab88 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -2580,8 +2580,8 @@ void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup ) setProperty( aGroup, TARGET_DIR_URL, makeAny( pGroup->getTargetURL() ) ); pGroup->setHierarchyURL( aNewGroupURL ); - sal_uIntPtr nCount = pGroup->count(); - for ( sal_uIntPtr i=0; i<nCount; i++ ) + size_t nCount = pGroup->count(); + for ( size_t i = 0; i < nCount; i++ ) { DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i ); addToHierarchy( pGroup, pData ); // add entry to hierarchy diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index ff323461cfa5..403d748a231e 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -358,9 +358,9 @@ int SvxShowCharSet::FirstInView() const int SvxShowCharSet::LastInView() const { - sal_uIntPtr nIndex = FirstInView(); + sal_uInt32 nIndex = FirstInView(); nIndex += ROW_COUNT * COLUMN_COUNT - 1; - sal_uIntPtr nCompare = sal::static_int_cast<sal_uIntPtr>(mxFontCharMap->GetCharCount() - 1); + sal_uInt32 nCompare = mxFontCharMap->GetCharCount() - 1; if (nIndex > nCompare) nIndex = nCompare; return nIndex; diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 286b74bb5a23..72a743fda6c8 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -2093,7 +2093,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) SdrPageView* pPV=pM->GetPageView(); SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject(); const size_t nInsPos=pObj->GetOrdNum()+1; - sal_uIntPtr nInsCnt=0; + size_t nInsCnt=0; tools::Rectangle aLogicRect; SdrGrafObj* pGraf = dynamic_cast<SdrGrafObj*>( pObj ); @@ -2142,7 +2142,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) if (aGeoStat.nRotationAngle) aGeoStat.RecalcSinCos(); - for (sal_uIntPtr i = 0; i < nInsCnt; i++) + for (size_t i = 0; i < nInsCnt; i++) { if (bUndo) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj))); |