diff options
| author | Hieronymous <sudk1896@gmail.com> | 2016-10-15 21:06:28 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-24 15:48:39 +0000 |
| commit | 39851c7f780e548d494a9ef8bdf256b32a631f00 (patch) | |
| tree | 360e19cef6e5daeea058f88d725e077c5aea840e | |
| parent | 34dc5ea5510df5692addbf4d8559e72085a4835b (diff) | |
tdf#75280 Clean up usage of sal_uIntPtr.
doctempl.hxx doesn't contain any sal_uIntPtr instances. GetCount and
GetRegionCount functions return sal_uInt16 hence sal_uIntPtr instances
have been converted to sal_uInt16.
Change-Id: Ifb48bf861c8ab5f262a535a7d34794eafd75fd6d
Reviewed-on: https://gerrit.libreoffice.org/29904
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sfx2/source/doc/doctempl.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index a1c31340f74c..28a997639320 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -341,9 +341,9 @@ sal_uInt16 SfxDocumentTemplates::GetRegionCount() const if ( !pImp->Construct() ) return 0; - sal_uIntPtr nCount = pImp->GetRegionCount(); + sal_uInt16 nCount = pImp->GetRegionCount(); - return (sal_uInt16) nCount; + return nCount; } @@ -368,12 +368,12 @@ sal_uInt16 SfxDocumentTemplates::GetCount return 0; RegionData_Impl *pData = pImp->GetRegion( nRegion ); - sal_uIntPtr nCount = 0; + sal_uInt16 nCount = 0; if ( pData ) nCount = pData->GetCount(); - return (sal_uInt16) nCount; + return nCount; } @@ -1152,16 +1152,16 @@ bool SfxDocumentTemplates::GetLogicNames DocTempl_EntryData_Impl *pEntry = nullptr; bool bFound = false; - sal_uIntPtr nCount = GetRegionCount(); + sal_uInt16 nCount = GetRegionCount(); - for ( sal_uIntPtr i=0; !bFound && (i<nCount); i++ ) + for ( sal_uInt16 i=0; !bFound && (i<nCount); i++ ) { pData = pImp->GetRegion( i ); if ( pData ) { - sal_uIntPtr nChildCount = pData->GetCount(); + sal_uInt16 nChildCount = pData->GetCount(); - for ( sal_uIntPtr j=0; !bFound && (j<nChildCount); j++ ) + for ( sal_uInt16 j=0; !bFound && (j<nChildCount); j++ ) { pEntry = pData->GetEntry( j ); if ( pEntry && pEntry->GetTargetURL() == aPath ) |