Consistently use size_t and SAL_MAX_SIZE

Instead of a mix of sal_uIntPtr, sal_uLong, int, and so on.
Also change CONTAINER_ENTRY_NOTFOUND=ULONG_MAX to SAL_MAX_SIZE as
return value in case of failure and in the related tests.

Change-Id: Ie778a849253b4be84fbcdab9557b7c4240233927

1 files changed, 3 insertions, 4 deletions

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index e6f179f1c24f..2c3bee7e14e4 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -684,9 +684,8 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
     ::std::vector< SdrMark* >&                  rObjVector2 = aObjVectors[ 1 ];
     const SdrLayerAdmin&                        rLayerAdmin = pMod->GetLayerAdmin();
     const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), false );
-    sal_uInt32                                  n, nCount;
 
-    for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
+    for( size_t n = 0, nCount = GetMarkedObjectCount(); n < nCount; ++n )
     {
         SdrMark* pMark = GetSdrMarkByIndex( n );
 
@@ -697,11 +696,11 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
             rObjVector1.push_back( pMark );
     }
 
-    for( n = 0, nCount = aObjVectors.size(); n < nCount; n++ )
+    for( size_t n = 0, nCount = aObjVectors.size(); n < nCount; ++n )
     {
         ::std::vector< SdrMark* >& rObjVector = aObjVectors[ n ];
 
-        for( sal_uInt32 i = 0; i < rObjVector.size(); i++ )
+        for( size_t i = 0; i < rObjVector.size(); ++i )
         {
             SdrMark*    pMark = rObjVector[ i ];
             aRetval.push_back(pMark->GetMarkedSdrObj());