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/view/drviewsj.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/view/drviewsj.cxx')
| -rw-r--r-- | sd/source/ui/view/drviewsj.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index d3bec9511d58..99f1d16409ef 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -61,7 +61,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) // Single selection const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - sal_uLong nMarkCount = rMarkList.GetMarkCount(); + const size_t nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { @@ -319,9 +319,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) bool bEdgeObj = false; // Connector bool bE3dCompoundObject = false; - for( sal_uLong i = 0; - i < nMarkCount && !bText && i < 50; - i++ ) + for( size_t i = 0; i < nMarkCount && !bText && i < 50; ++i ) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); sal_uInt32 nInv = pObj->GetObjInventor(); |