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 /sc/source/ui/drawfunc/drawsh2.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 'sc/source/ui/drawfunc/drawsh2.cxx')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 54a6ee8ddea5..294e630e0d90 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -96,8 +96,7 @@ void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles // Notes always default to Page anchor. bool bDisableAnchor = false; const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - sal_uLong nMarkCount = rMarkList.GetMarkCount(); - if ( nMarkCount == 1 ) + if ( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( ScDrawLayer::IsNoteCaption( pObj ) ) @@ -145,7 +144,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl } const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - sal_uLong nMarkCount = rMarkList.GetMarkCount(); + const size_t nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount <= 1 || !pView->IsGroupPossible() ) rSet.DisableItem( SID_GROUP ); @@ -363,8 +362,8 @@ void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet) bool ScDrawShell::AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark) { bool bResult=true; - sal_uLong nCount = rMark.GetMarkCount(); - for (sal_uLong i=0; i<nCount; i++) + const size_t nCount = rMark.GetMarkCount(); + for (size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj(); if ( !pObj->ISA(SdrUnoObj) ) |