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 /svx/source/svdraw/svdedtv.cxx | |
| parent | df159d3cd0bce255e14839a81d921e73771ca886 (diff) | |
Consistently use size_t and SAL_MAX_SIZE
Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec
Diffstat (limited to 'svx/source/svdraw/svdedtv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdedtv.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 48a286f45017..130690d19761 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -123,9 +123,8 @@ SdrLayer* SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos) bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const { bool bDelAll(true); - sal_uInt32 nObjAnz(pOL->GetObjCount()); - for(sal_uInt32 nObjNum(nObjAnz); nObjNum > 0 && bDelAll;) + for(size_t nObjNum = pOL->GetObjCount(); nObjNum > 0 && bDelAll;) { nObjNum--; SdrObject* pObj = pOL->GetObj(nObjNum); @@ -153,13 +152,13 @@ bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID) { - sal_uInt32 nObjAnz(pOL->GetObjCount()); + const size_t nObjAnz(pOL->GetObjCount()); // make sure OrdNums are correct pOL->GetObj(0)->GetOrdNum(); const bool bUndo = GetModel()->IsUndoEnabled(); - for(sal_uInt32 nObjNum(nObjAnz); nObjNum > 0;) + for(size_t nObjNum = nObjAnz; nObjNum > 0;) { nObjNum--; SdrObject* pObj = pOL->GetObj(nObjNum); @@ -223,13 +222,13 @@ void SdrEditView::DeleteLayer(const OUString& rName) { // over all pages SdrPage* pPage = (bMaPg) ? pMod->GetMasterPage(nPgNum) : pMod->GetPage(nPgNum); - sal_uInt32 nObjAnz(pPage->GetObjCount()); + const size_t nObjAnz(pPage->GetObjCount()); // make sure OrdNums are correct if(nObjAnz) pPage->GetObj(0)->GetOrdNum(); - for(sal_uInt32 nObjNum(nObjAnz); nObjNum > 0;) + for(size_t nObjNum(nObjAnz); nObjNum > 0;) { nObjNum--; SdrObject* pObj = pPage->GetObj(nObjNum); @@ -672,7 +671,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage() { pM->GetPageView()->GetObjList()->RemoveObject(pObj->GetOrdNum()); SdrInsertReason aReason(SDRREASON_VIEWCALL); - pPV->GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason); + pPV->GetObjList()->InsertObject(pObj, SAL_MAX_SIZE, &aReason); pM->SetPageView(pPV); InvalidateAllWin(aObjRect); bFlg=true; @@ -726,7 +725,7 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark) SdrMark* pM = rMark.GetMark(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); SdrObjList* pOL = pObj->GetObjList(); - const sal_uInt32 nOrdNum(pObj->GetOrdNumDirect()); + const size_t nOrdNum(pObj->GetOrdNumDirect()); bool bIs3D = dynamic_cast< E3dObject* >(pObj); // set up a scene updater if object is a 3d object @@ -902,7 +901,7 @@ void SdrEditView::CopyMarkedObj() SdrObject* pO=pM->GetMarkedSdrObj()->Clone(); if (pO!=NULL) { SdrInsertReason aReason(SDRREASON_VIEWCALL); - pM->GetPageView()->GetObjList()->InsertObject(pO,CONTAINER_APPEND,&aReason); + pM->GetPageView()->GetObjList()->InsertObject(pO, SAL_MAX_SIZE, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoCopyObject(*pO)); @@ -967,9 +966,9 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uInt if (!pObj->IsInserted()) { SdrInsertReason aReason(SDRREASON_VIEWCALL); if ((nOptions & SDRINSERT_NOBROADCAST)!=0) { - rPV.GetObjList()->NbcInsertObject(pObj,CONTAINER_APPEND,&aReason); + rPV.GetObjList()->NbcInsertObject(pObj, SAL_MAX_SIZE, &aReason); } else { - rPV.GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason); + rPV.GetObjList()->InsertObject(pObj, SAL_MAX_SIZE, &aReason); } } if( IsUndoEnabled() ) |