[Libreoffice-commits] core.git: sfx2/source

[Hieronymous]

 sfx2/source/doc/doctempl.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 39851c7f780e548d494a9ef8bdf256b32a631f00
Author: Hieronymous <sudk1...@gmail.com>
Date:   Sat Oct 15 21:06:28 2016 +0530

    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 <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index a1c3134..28a9976 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits