diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-05 22:30:24 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 21:52:28 +0200 |
commit | 384cb5ff7b9227002206422d0bf4e75795d5f5cc (patch) | |
tree | 21a15556a592c9bc42893c69d98d23b64c1a9464 /svx/source/svdraw/svdxcgv.cxx | |
parent | 7e605f124f78a7f8b97385fcb8b91dce2ec735d8 (diff) |
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
Diffstat (limited to 'svx/source/svdraw/svdxcgv.cxx')
-rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 7 |
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()); |