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 /svx/source/svdraw/svdpoev.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 'svx/source/svdraw/svdpoev.cxx')
-rw-r--r-- | svx/source/svdraw/svdpoev.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index ec74e3cbd4dc..fcd5b0a5a7d6 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -63,7 +63,7 @@ SdrPolyEditView::~SdrPolyEditView() void SdrPolyEditView::ImpCheckPolyPossibilities() { ImpResetPolyPossibilityFlags(); - const sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); if(nMarkAnz && !ImpIsFrameHandles()) { @@ -74,7 +74,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities() bool bSegmFuz(false); basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE; - for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) + for(size_t nMarkNum = 0; nMarkNum < nMarkAnz; ++nMarkNum) { SdrMark* pM = GetSdrMarkByIndex(nMarkNum); CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth ); @@ -204,11 +204,11 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints()); - sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); - for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) + for(size_t nMarkNum(nMarkAnz); nMarkNum > 0;) { - nMarkNum--; + --nMarkNum; SdrMark* pM = GetSdrMarkByIndex(nMarkNum); SdrUShortCont* pPts = pM->GetMarkedPoints(); SdrPathObj* pPath = dynamic_cast< SdrPathObj* >( pM->GetMarkedSdrObj() ); @@ -239,11 +239,11 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints()); - sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); - for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) + for(size_t nMarkNum=nMarkAnz; nMarkNum > 0;) { - nMarkNum--; + --nMarkNum; SdrMark* pM = GetSdrMarkByIndex(nMarkNum); SdrUShortCont* pPts = pM->GetMarkedPoints(); SdrPathObj* pPath = dynamic_cast< SdrPathObj* >( pM->GetMarkedSdrObj() ); @@ -300,7 +300,7 @@ void SdrPolyEditView::DeleteMarkedPoints() { BrkAction(); SortMarkedObjects(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + const size_t nMarkAnz=GetMarkedObjectCount(); const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -309,9 +309,9 @@ void SdrPolyEditView::DeleteMarkedPoints() BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE); } - for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;) + for (size_t nMarkNum=nMarkAnz; nMarkNum>0;) { - nMarkNum--; + --nMarkNum; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrUShortCont* pPts=pM->GetMarkedPoints(); SdrPathObj* pPath = dynamic_cast< SdrPathObj* >( pM->GetMarkedSdrObj() ); @@ -354,15 +354,15 @@ void SdrPolyEditView::RipUpAtMarkedPoints() if(HasMarkedPoints()) { SortMarkedObjects(); - sal_uInt32 nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditRipUp), GetDescriptionOfMarkedPoints()); - for(sal_uInt32 nMarkNum(nMarkAnz); nMarkNum > 0L;) + for(size_t nMarkNum = nMarkAnz; nMarkNum > 0;) { - nMarkNum--; + --nMarkNum; SdrMark* pM = GetSdrMarkByIndex(nMarkNum); SdrUShortCont* pPts = pM->GetMarkedPoints(); SdrPathObj* pObj = PTR_CAST(SdrPathObj, pM->GetMarkedSdrObj()); @@ -428,9 +428,9 @@ void SdrPolyEditView::RipUpAtMarkedPoints() bool SdrPolyEditView::IsRipUpAtMarkedPointsPossible() const { bool bRetval(false); - const sal_uInt32 nMarkCount(GetMarkedObjectCount()); + const size_t nMarkCount(GetMarkedObjectCount()); - for(sal_uInt32 a(0); a < nMarkCount; a++) + for(size_t a = 0; a < nMarkCount; ++a) { const SdrMark* pMark = GetSdrMarkByIndex(a); const SdrPathObj* pMarkedPathObject = dynamic_cast< const SdrPathObj* >(pMark->GetMarkedSdrObj()); @@ -473,9 +473,9 @@ bool SdrPolyEditView::IsRipUpAtMarkedPointsPossible() const bool SdrPolyEditView::IsOpenCloseMarkedObjectsPossible() const { bool bRetval(false); - const sal_uInt32 nMarkCount(GetMarkedObjectCount()); + const size_t nMarkCount(GetMarkedObjectCount()); - for(sal_uInt32 a(0); a < nMarkCount; a++) + for(size_t a = 0; a < nMarkCount; ++a) { const SdrMark* pMark = GetSdrMarkByIndex(a); const SdrPathObj* pMarkedPathObject = dynamic_cast< const SdrPathObj* >(pMark->GetMarkedSdrObj()); @@ -504,9 +504,9 @@ SdrObjClosedKind SdrPolyEditView::GetMarkedObjectsClosedState() const { bool bOpen(false); bool bClosed(false); - const sal_uInt32 nMarkCount(GetMarkedObjectCount()); + const size_t nMarkCount(GetMarkedObjectCount()); - for(sal_uInt32 a(0); !(bOpen && bClosed) && a < nMarkCount; a++) + for(size_t a = 0; !(bOpen && bClosed) && a < nMarkCount; ++a) { const SdrMark* pMark = GetSdrMarkByIndex(a); const SdrPathObj* pMarkedPathObject = dynamic_cast< const SdrPathObj* >(pMark->GetMarkedSdrObj()); @@ -547,8 +547,8 @@ void SdrPolyEditView::CloseMarkedObjects(bool bToggle, bool bOpen) BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints()); bool bChg=false; - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nm=0; nm<nMarkAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -582,8 +582,8 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* { const bool bUndo = IsUndoEnabled(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nm=0; nm<nMarkAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); |