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 /sd/source/ui/func/fucopy.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 'sd/source/ui/func/fucopy.cxx')
| -rw-r--r-- | sd/source/ui/func/fucopy.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index e237f82e21f4..c4bc3d791c1f 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -183,7 +183,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); - const sal_uLong nMarkCount = aMarkList.GetMarkCount(); + const size_t nMarkCount = aMarkList.GetMarkCount(); SdrObject* pObj = NULL; // calculate number of possible copies @@ -221,10 +221,10 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // get newly selected objects SdrMarkList aCopyMarkList( mpView->GetMarkedObjectList() ); - sal_uLong j, nCopyMarkCount = aMarkList.GetMarkCount(); + const size_t nCopyMarkCount = aMarkList.GetMarkCount(); // set protection flags at marked copies to null - for( j = 0; j < nCopyMarkCount; j++ ) + for( size_t j = 0; j < nCopyMarkCount; ++j ) { pObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); @@ -250,7 +250,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // set protection flags at marked copies to original values if( nMarkCount == nCopyMarkCount ) { - for( j = 0; j < nMarkCount; j++ ) + for( size_t j = 0; j < nMarkCount; ++j ) { SdrObject* pSrcObj = aMarkList.GetMark( j )->GetMarkedSdrObj(); SdrObject* pDstObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); |