diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 12:59:11 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 21:52:32 +0200 |
| commit | 47e2fd0dc8d88af120508e463decf5b15563a629 (patch) | |
| tree | 55ca49e099c6401643772db012fae6e3ec15c501 /sd/source/ui/func | |
| parent | df159d3cd0bce255e14839a81d921e73771ca886 (diff) | |
Consistently use size_t and SAL_MAX_SIZE
Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec
Diffstat (limited to 'sd/source/ui/func')
| -rw-r--r-- | sd/source/ui/func/fuconarc.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuconbez.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/func/fumorph.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 461eee36dec9..7f57ddf53224 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -140,7 +140,7 @@ bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { - sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); + const size_t nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); if (mpView->EndCreateObj(SDRCREATE_NEXTPOINT) ) { diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 541b38ad5a9a..ad605555c805 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -146,7 +146,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) SdrViewEvent aVEvt; mpView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt); - sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); + const size_t nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); if (mpView->IsInsObjPoint()) { @@ -161,7 +161,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) { bReturn = true; - if (nCount == (mpView->GetSdrPageView()->GetObjList()->GetObjCount() - 1)) + if (nCount+1 == mpView->GetSdrPageView()->GetObjList()->GetObjCount()) { bCreated = true; } diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 272a95d8b1da..c113f38bb7ed 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -430,13 +430,13 @@ void FuMorph::ImpInsertPolygons( pNewObj->SetMergedItemSetAndBroadcast(aSet); - pObjList->InsertObject( pNewObj, CONTAINER_APPEND ); + pObjList->InsertObject( pNewObj ); } if ( nCount ) { pObjList->InsertObject( pObj1->Clone(), 0 ); - pObjList->InsertObject( pObj2->Clone(), CONTAINER_APPEND ); + pObjList->InsertObject( pObj2->Clone() ); mpView->DeleteMarked(); mpView->InsertObjectAtView( pObjGroup, *pPageView, SDRINSERT_SETDEFLAYER ); } |