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 | |
| 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')
34 files changed, 445 insertions, 477 deletions
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 74ffcab8b5f9..894de0ebb32e 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -652,7 +652,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun throw DisposedException(); const SdrMarkList& rList = mpView->GetMarkedObjectList(); - return rList.GetMarkCount(); + return static_cast<sal_Int32>(rList.GetMarkCount()); } @@ -667,7 +667,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce Reference< XAccessible > xAccessible; const SdrMarkList& rList = mpView->GetMarkedObjectList(); - SdrObject* pObj = rList.GetMark(nIndex)->GetMarkedSdrObj(); + SdrObject* pObj = rList.GetMark(static_cast<size_t>(nIndex))->GetMarkedSdrObj(); if( pObj ) xAccessible = getAccessible( pObj ); @@ -694,9 +694,8 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 SdrPageView* pPV = mpView->GetSdrPageView(); mpView->UnmarkAllObj( pPV ); - sal_uInt32 nCount = aRefList.GetMarkCount(); - sal_uInt32 nMark; - for( nMark = 0; nMark < nCount; nMark++ ) + const size_t nCount = aRefList.GetMarkCount(); + for( size_t nMark = 0; nMark < nCount; ++nMark ) { if( aRefList.GetMark(nMark)->GetMarkedSdrObj() != pObj ) mpView->MarkObj( aRefList.GetMark(nMark)->GetMarkedSdrObj(), pPV ); diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index bc6d869de696..82153a3a0275 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -145,13 +145,13 @@ void SvxXConnectionPreview::Construct() DBG_ASSERT( pView, "No valid view is passed on! "); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - sal_uIntPtr nMarkCount = rMarkList.GetMarkCount(); + const size_t nMarkCount = rMarkList.GetMarkCount(); if( nMarkCount >= 1 ) { bool bFound = false; - for( sal_uInt16 i = 0; i < nMarkCount && !bFound; i++ ) + for( size_t i = 0; i < nMarkCount && !bFound; ++i ) { const SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); sal_uInt32 nInv = pObj->GetObjInventor(); diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 65a9538bc3ee..8e6316c37df5 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -580,7 +580,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) // restore point with focus SdrHdl* pNewOne = 0L; - for(sal_uInt32 a(0); !pNewOne && a < rHdlList.GetHdlCount(); a++) + for(size_t a = 0; !pNewOne && a < rHdlList.GetHdlCount(); ++a) { SdrHdl* pAct = rHdlList.GetHdl(a); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index c076a8c078df..6156dee9a7e8 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -470,7 +470,7 @@ void IMapWindow::Command(const CommandEvent& rCEvt) { PopupMenu aMenu( SVX_RES( RID_SVXMN_IMAP ) ); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - sal_uIntPtr nMarked = rMarkList.GetMarkCount(); + const size_t nMarked = rMarkList.GetMarkCount(); aMenu.EnableItem( MN_URL, false ); aMenu.EnableItem( MN_ACTIVATE, false ); diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index dd410bbeb231..e1c2fb6f105a 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -48,16 +48,15 @@ E3dDragMethod::E3dDragMethod ( mbMovedAtAll(false) { // Create a unit for all the 3D objects present in the selection - const long nCnt(rMark.GetMarkCount()); + const size_t nCnt(rMark.GetMarkCount()); static bool bDoInvalidate(false); - long nObjs(0); if(mbMoveFull) { // for non-visible 3D objects fallback to wireframe interaction bool bInvisibleObjects(false); - for(nObjs = 0;!bInvisibleObjects && nObjs < nCnt;nObjs++) + for(size_t nObjs = 0; !bInvisibleObjects && nObjs < nCnt; ++nObjs) { E3dObject* pE3dObj = dynamic_cast< E3dObject* >(rMark.GetMark(nObjs)->GetMarkedSdrObj()); @@ -76,7 +75,7 @@ E3dDragMethod::E3dDragMethod ( } } - for(nObjs = 0;nObjs < nCnt;nObjs++) + for(size_t nObjs = 0; nObjs < nCnt; ++nObjs) { E3dObject* pE3dObj = dynamic_cast< E3dObject* >(rMark.GetMark(nObjs)->GetMarkedSdrObj()); diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index bbbbe553079c..9702cacfdd9c 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -85,7 +85,7 @@ class Impl3DMirrorConstructOverlay const E3dView& mrView; // the object count - sal_uInt32 mnCount; + size_t mnCount; // the unmirrored polygons basegfx::B2DPolyPolygon* mpPolygons; @@ -121,7 +121,7 @@ Impl3DMirrorConstructOverlay::Impl3DMirrorConstructOverlay(const E3dView& rView) // Do not use the last ViewPort set at the OC at the last ProcessDisplay() rOC.resetViewPort(); - for(sal_uInt32 a(0);a < mnCount;a++) + for(size_t a = 0; a < mnCount; ++a) { SdrObject* pObject = mrView.GetMarkedObjectByIndex(a); @@ -140,7 +140,7 @@ Impl3DMirrorConstructOverlay::Impl3DMirrorConstructOverlay(const E3dView& rView) { mpPolygons = new basegfx::B2DPolyPolygon[mnCount]; - for(sal_uInt32 a(0); a < mnCount; a++) + for(size_t a = 0; a < mnCount; ++a) { SdrObject* pObject = mrView.GetMarkedObjectByIndex(a); mpPolygons[mnCount - (a + 1)] = pObject->TakeXorPoly(); @@ -209,7 +209,7 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr } else { - for(sal_uInt32 b(0); b < mnCount; b++) + for(size_t b = 0; b < mnCount; ++b) { // apply to polygon basegfx::B2DPolyPolygon aPolyPolygon(mpPolygons[b]); @@ -240,8 +240,8 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const bool bSpecialHandling = false; E3dScene *pScene = NULL; - long nCnt = GetMarkedObjectCount(); - for(long nObjs = 0;nObjs < nCnt;nObjs++) + const size_t nCnt = GetMarkedObjectCount(); + for(size_t nObjs = 0; nObjs < nCnt; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) @@ -264,8 +264,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const { // Set selection flag to "not selected" for scenes related to all 3D // objects - long nObjs; - for(nObjs = 0;nObjs < nCnt;nObjs++) + for(size_t nObjs = 0; nObjs < nCnt; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) @@ -277,7 +276,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const } } - for(nObjs = 0;nObjs < nCnt;nObjs++) + for(size_t nObjs = 0; nObjs < nCnt; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dObject)) @@ -300,7 +299,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const } // Reset selection flag - for(nObjs = 0;nObjs < nCnt;nObjs++) + for(size_t nObjs = 0; nObjs < nCnt; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) @@ -326,11 +325,10 @@ SdrModel* E3dView::GetMarkedObjModel() const { // Does 3D objects exist which scenes are not selected? bool bSpecialHandling(false); - const sal_uInt32 nCount(GetMarkedObjectCount()); - sal_uInt32 nObjs(0); + const size_t nCount(GetMarkedObjectCount()); E3dScene *pScene = 0; - for(nObjs = 0; nObjs < nCount; nObjs++) + for(size_t nObjs = 0; nObjs < nCount; ++nObjs) { const SdrObject* pObj = GetMarkedObjectByIndex(nObjs); @@ -369,7 +367,7 @@ SdrModel* E3dView::GetMarkedObjModel() const // set 3d selection flags at all directly selected objects // and collect SnapRect of selected objects - for(nObjs = 0; nObjs < nCount; nObjs++) + for(size_t nObjs = 0; nObjs < nCount; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); @@ -389,7 +387,7 @@ SdrModel* E3dView::GetMarkedObjModel() const SdrMarkList& rCurrentMarkList = ((E3dView*)this)->GetMarkedObjectListWriteAccess(); rCurrentMarkList = aNewML; - for(nObjs = 0; nObjs < nCount; nObjs++) + for(size_t nObjs = 0; nObjs < nCount; ++nObjs) { SdrObject *pObj = aOldML.GetMark(nObjs)->GetMarkedSdrObj(); @@ -612,7 +610,7 @@ bool E3dView::IsConvertTo3DObjPossible() const bool bGroupSelected(false); bool bRetval(true); - for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++) + for(size_t a=0; !bAny3D && a<GetMarkedObjectCount(); ++a) { SdrObject *pObj = GetMarkedObjectByIndex(a); if(pObj) @@ -902,7 +900,7 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, basegfx::B2DPoint aPnt1, baseg aInvLatheMat.invert(); // SnapRect extension enables mirroring in the axis of rotation - for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) + for(size_t a=0; a<GetMarkedObjectCount(); ++a) { SdrMark* pMark = GetSdrMarkByIndex(a); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -942,7 +940,7 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, basegfx::B2DPoint aPnt1, baseg // Walk through the selection and convert it into 3D, complete with // Conversion to SdrPathObject, also fonts - for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) + for(size_t a=0; a<GetMarkedObjectCount(); ++a) { SdrMark* pMark = GetSdrMarkByIndex(a); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -1213,13 +1211,13 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, bOwnActionNecessary = false; } - if(bOwnActionNecessary && GetMarkedObjectCount() >= 1) + if(bOwnActionNecessary && GetMarkedObjectCount() > 0) { E3dDragConstraint eConstraint = E3DDRAG_CONSTR_XYZ; bool bThereAreRootScenes = false; bool bThereAre3DObjects = false; - long nCnt = GetMarkedObjectCount(); - for(long nObjs = 0;nObjs < nCnt;nObjs++) + const size_t nCnt = GetMarkedObjectCount(); + for(size_t nObjs = 0; nObjs < nCnt; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj) @@ -1380,7 +1378,7 @@ void E3dView::Start3DCreation() // and then attach the marks at the top and bottom of the object basegfx::B2DRange aR; - for(sal_uInt32 nMark(0L); nMark < GetMarkedObjectCount(); nMark++) + for(size_t nMark = 0; nMark < GetMarkedObjectCount(); ++nMark) { SdrObject* pMark = GetMarkedObjectByIndex(nMark); basegfx::B2DPolyPolygon aXPP(pMark->TakeXorPoly()); @@ -1544,13 +1542,11 @@ void E3dView::InitView () bool E3dView::IsBreak3DObjPossible() const { - sal_uIntPtr nCount = GetMarkedObjectCount(); + const size_t nCount = GetMarkedObjectCount(); if (nCount > 0) { - sal_uIntPtr i = 0; - - while (i < nCount) + for (size_t i = 0; i < nCount; ++i) { SdrObject* pObj = GetMarkedObjectByIndex(i); @@ -1563,8 +1559,6 @@ bool E3dView::IsBreak3DObjPossible() const { return false; } - - i++; } } else @@ -1580,10 +1574,10 @@ void E3dView::Break3DObj() if(IsBreak3DObjPossible()) { // ALL selected objects are changed - sal_uInt32 nCount = GetMarkedObjectCount(); + const size_t nCount = GetMarkedObjectCount(); BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)); - for(sal_uInt32 a=0;a<nCount;a++) + for(size_t a=0; a<nCount; ++a) { E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a); BreakSingle3DObj(pObj); @@ -1626,10 +1620,10 @@ void E3dView::CheckPossibilities() // Set other flags if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible) { - sal_Int32 nMarkCnt = GetMarkedObjectCount(); + const size_t nMarkCnt = GetMarkedObjectCount(); bool bCoumpound = false; bool b3DObject = false; - for(sal_Int32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++) + for(size_t nObjs = 0; (nObjs < nMarkCnt) && !bCoumpound; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 07becc8004f1..8f194a49d56e 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -119,9 +119,9 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, bool /*bOnly3DAttr*/) co // calc flags for SID_ATTR_3D_INTERN const SdrMarkList& rMarkList = GetMarkedObjectList(); - sal_uInt32 nMarkCnt(rMarkList.GetMarkCount()); + const size_t nMarkCnt(rMarkList.GetMarkCount()); - for(sal_uInt32 a(0); a < nMarkCnt; a++) + for(size_t a = 0; a < nMarkCnt; ++a) { SdrObject* pObj = GetMarkedObjectByIndex(a); Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems); @@ -169,9 +169,9 @@ void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, bool // old run const SdrMarkList& rMarkList = GetMarkedObjectList(); - const sal_uInt32 nMarkCnt(rMarkList.GetMarkCount()); + const size_t nMarkCnt(rMarkList.GetMarkCount()); - for(sal_uInt32 a(0); a < nMarkCnt; a++) + for(size_t a = 0; a < nMarkCnt; ++a) { SdrObject* pObj = GetMarkedObjectByIndex(a); Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 8d8c5368923a..dab6033698ae 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -281,8 +281,8 @@ namespace { _rInterfaces.clear(); - sal_uInt32 nMarkCount = _rMarkList.GetMarkCount(); - for ( sal_uInt32 i = 0; i < nMarkCount; ++i) + const size_t nMarkCount = _rMarkList.GetMarkCount(); + for ( size_t i = 0; i < nMarkCount; ++i) { SdrObject* pCurrent = _rMarkList.GetMark( i )->GetMarkedSdrObj(); @@ -557,12 +557,12 @@ bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface> bool isControlList(const SdrMarkList& rMarkList) { // enthaelt die liste nur Controls und mindestens ein control - sal_uInt32 nMarkCount = rMarkList.GetMarkCount(); + const size_t nMarkCount = rMarkList.GetMarkCount(); bool bControlList = nMarkCount != 0; bool bHadAnyLeafs = false; - for (sal_uInt32 i = 0; i < nMarkCount && bControlList; i++) + for (size_t i = 0; i < nMarkCount && bControlList; ++i) { SdrObject *pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); E3dObject* pAs3DObject = PTR_CAST(E3dObject, pObj); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 9dddc6769a42..850eda9f15e3 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1686,8 +1686,8 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) // muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen // (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen) - sal_uIntPtr nCount = m_aMark.GetMarkCount(); - for (sal_uIntPtr i = 0; i < nCount; ++i) + const size_t nCount = m_aMark.GetMarkCount(); + for (size_t i = 0; i < nCount; ++i) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pCurrent = pMark->GetMarkedSdrObj(); @@ -1739,8 +1739,8 @@ void FmXFormView::saveMarkList( bool _bSmartUnmark ) m_aMark = m_pView->GetMarkedObjectList(); if ( _bSmartUnmark ) { - sal_uIntPtr nCount = m_aMark.GetMarkCount( ); - for ( sal_uIntPtr i = 0; i < nCount; ++i ) + const size_t nCount = m_aMark.GetMarkCount( ); + for ( size_t i = 0; i < nCount; ++i ) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -1806,15 +1806,15 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) bool bMisMatch = false; // loop through all current marks - sal_uIntPtr nCurrentCount = rCurrentList.GetMarkCount(); - for ( sal_uIntPtr i=0; i<nCurrentCount&& !bMisMatch; ++i ) + const size_t nCurrentCount = rCurrentList.GetMarkCount(); + for ( size_t i=0; i<nCurrentCount && !bMisMatch; ++i ) { const SdrObject* pCurrentMarked = rCurrentList.GetMark( i )->GetMarkedSdrObj(); // loop through all saved marks, check for equality bool bFound = false; - sal_uIntPtr nSavedCount = m_aMark.GetMarkCount(); - for ( sal_uIntPtr j=0; j<nSavedCount && !bFound; ++j ) + const size_t nSavedCount = m_aMark.GetMarkCount(); + for ( size_t j=0; j<nSavedCount && !bFound; ++j ) { if ( m_aMark.GetMark( j )->GetMarkedSdrObj() == pCurrentMarked ) bFound = true; @@ -1839,8 +1839,8 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) bool bFound = true; // gibt es noch alle Objecte - sal_uIntPtr nCount = m_aMark.GetMarkCount(); - for (sal_uIntPtr i = 0; i < nCount && bFound; i++) + const size_t nCount = m_aMark.GetMarkCount(); + for (size_t i = 0; i < nCount && bFound; ++i) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -1861,7 +1861,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) // Das LastObject auswerten if (nCount) // Objecte jetzt Markieren { - for (sal_uIntPtr i = 0; i < nCount; i++) + for (size_t i = 0; i < nCount; ++i) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pObj = pMark->GetMarkedSdrObj(); diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 9df5153eb98d..7ae2d7eb8385 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -824,7 +824,7 @@ namespace svxform FmNavRequestSelectHint rshRequestSelection; bool bIsMixedSelection = false; - for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++) + for (size_t i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; ++i) { SdrObject* pobjCurrent = mlMarked.GetMark(i)->GetMarkedSdrObj(); bIsMixedSelection |= !InsertFormComponent(rshRequestSelection, pobjCurrent); diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index 39d85fc73b8c..b994eb014324 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -311,7 +311,7 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( sal_uInt32 SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkList) { - const sal_uLong nMarkCount (rMarkList.GetMarkCount()); + const size_t nMarkCount (rMarkList.GetMarkCount()); if (nMarkCount < 1) return 0; @@ -320,7 +320,7 @@ sal_uInt32 SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkL SdrObject* pObj = pMark->GetMarkedSdrObj(); const sal_uInt32 nFirstInv = pObj->GetObjInventor(); - for (sal_uLong nIndex=1; nIndex<nMarkCount; ++nIndex) + for (size_t nIndex=1; nIndex<nMarkCount; ++nIndex) { pMark = rMarkList.GetMark(nIndex); pObj = pMark->GetMarkedSdrObj(); @@ -393,7 +393,7 @@ sal_uInt16 SelectionAnalyzer::GetObjectTypeFromGroup (const SdrObject* pObj) sal_uInt16 SelectionAnalyzer::GetObjectTypeFromMark (const SdrMarkList& rMarkList) { - const sal_uLong nMarkCount (rMarkList.GetMarkCount()); + const size_t nMarkCount (rMarkList.GetMarkCount()); if (nMarkCount < 1) return 0; @@ -411,7 +411,7 @@ sal_uInt16 SelectionAnalyzer::GetObjectTypeFromMark (const SdrMarkList& rMarkLi if (IsTextObjType(nResultType)) nResultType = OBJ_TEXT; - for (sal_uLong nIndex=1; nIndex<nMarkCount; ++nIndex) + for (size_t nIndex=1; nIndex<nMarkCount; ++nIndex) { pMark = rMarkList.GetMark(nIndex); pObj = pMark->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index c3d7f9791190..9c92001b56af 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -367,12 +367,12 @@ void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, s void SdrDragMethod::createSdrDragEntries_SolidDrag() { - const sal_uInt32 nMarkAnz(getSdrDragView().GetMarkedObjectCount()); + const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount()); SdrPageView* pPV = getSdrDragView().GetSdrPageView(); if(pPV) { - for(sal_uInt32 a(0); a < nMarkAnz; a++) + for(size_t a = 0; a < nMarkAnz; ++a) { SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(a); @@ -427,12 +427,12 @@ void SdrDragMethod::createSdrDragEntries_SolidDrag() void SdrDragMethod::createSdrDragEntries_PolygonDrag() { - const sal_uInt32 nMarkAnz(getSdrDragView().GetMarkedObjectCount()); + const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount()); bool bNoPolygons(getSdrDragView().IsNoDragXorPolys() || nMarkAnz > getSdrDragView().GetDragXorPolyLimit()); basegfx::B2DPolyPolygon aResult; sal_uInt32 nPointCount(0); - for(sal_uInt32 a(0); !bNoPolygons && a < nMarkAnz; a++) + for(size_t a = 0; !bNoPolygons && a < nMarkAnz; ++a) { SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(a); @@ -474,10 +474,10 @@ void SdrDragMethod::createSdrDragEntries_PolygonDrag() void SdrDragMethod::createSdrDragEntries_PointDrag() { - const sal_uInt32 nMarkAnz(getSdrDragView().GetMarkedObjectCount()); + const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount()); std::vector< basegfx::B2DPoint > aPositions; - for(sal_uInt32 nm(0); nm < nMarkAnz; nm++) + for(size_t nm = 0; nm < nMarkAnz; ++nm) { SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(nm); @@ -520,10 +520,10 @@ void SdrDragMethod::createSdrDragEntries_PointDrag() void SdrDragMethod::createSdrDragEntries_GlueDrag() { - const sal_uInt32 nMarkAnz(getSdrDragView().GetMarkedObjectCount()); + const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount()); std::vector< basegfx::B2DPoint > aPositions; - for(sal_uInt32 nm(0); nm < nMarkAnz; nm++) + for(size_t nm = 0; nm < nMarkAnz; ++nm) { SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(nm); @@ -888,7 +888,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla const bool bDetail(getSdrDragView().IsDetailedEdgeDragging() && getMoveOnly()); const SdrMarkList& rMarkedNodes = getSdrDragView().GetEdgesOfMarkedNodes(); - for(sal_uInt16 a(0); a < rMarkedNodes.GetMarkCount(); a++) + for(size_t a = 0; a < rMarkedNodes.GetMarkCount(); ++a) { SdrMark* pEM = rMarkedNodes.GetMark(a); @@ -1680,13 +1680,13 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) { // restrict glue points to the BoundRect of the Obj aPt1-=DragStat().GetStart(); const SdrMarkList& rML=GetMarkedObjectList(); - sal_uLong nMarkAnz=rML.GetMarkCount(); + const size_t nMarkAnz=rML.GetMarkCount(); - for (sal_uLong nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { const SdrMark* pM=rML.GetMark(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - sal_uLong nPtAnz=pPts==NULL ? 0 : pPts->size(); + const size_t nPtAnz=pPts==NULL ? 0 : pPts->size(); if (nPtAnz!=0) { @@ -3406,9 +3406,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy) if (bCopy) getSdrDragView().CopyMarkedObj(); - sal_uLong nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); + const size_t nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); - for (sal_uLong nm=0; nm<nMarkAnz; nm++) + for (size_t nm=0; nm<nMarkAnz; ++nm) { SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 428ab361bd0e..0b047d5af76f 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -269,7 +269,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { // are 3D objects selected? bool b3DObjSelected = false; - for(sal_uInt32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++) + for(size_t a=0; !b3DObjSelected && a<GetMarkedObjectCount(); ++a) { SdrObject* pObj = GetMarkedObjectByIndex(a); if(pObj && pObj->ISA(E3dObject)) @@ -735,7 +735,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt) bool bRet=false; SdrObject* pObj; SdrPageView* pPV; - sal_uIntPtr nMarkNum; + size_t nMarkNum; if (PickMarkedObj(rPnt,pObj,pPV,&nMarkNum,SDRSEARCH_PASS2BOUND)) { BrkAction(); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 802e0fafd88c..48a286f45017 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -344,10 +344,9 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() } } - sal_uIntPtr nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount(); - sal_uInt16 i; + const size_t nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount(); - for (i=0; i<nMarkedEdgeAnz; i++) { + for (size_t i=0; i<nMarkedEdgeAnz; ++i) { SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i); SdrObject* pEdgeTmp=pEM->GetMarkedSdrObj(); SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pEdgeTmp); @@ -474,11 +473,11 @@ void SdrEditView::CheckPossibilities() if (bPossibilitiesDirty) { ImpResetPossibilityFlags(); SortMarkedObjects(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + const size_t nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz!=0) { bReverseOrderPossible=nMarkAnz>=2; - sal_uIntPtr nMovableCount=0; + size_t nMovableCount=0; bGroupPossible=nMarkAnz>=2; bCombinePossible=nMarkAnz>=2; if (nMarkAnz==1) { @@ -536,7 +535,7 @@ void SdrEditView::CheckPossibilities() bool bNoMovRotFound=false; const SdrPageView* pPV0=NULL; - for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { + for (size_t nm=0; nm<nMarkAnz; ++nm) { const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrPageView* pPV=pM->GetPageView(); @@ -655,7 +654,7 @@ void SdrEditView::CheckPossibilities() void SdrEditView::ForceMarkedObjToAnotherPage() { bool bFlg=false; - for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { + for (size_t nm=0; nm<GetMarkedObjectCount(); ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); Rectangle aObjRect(pObj->GetCurrentBoundRect()); @@ -694,18 +693,17 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark) const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(); - const sal_uInt32 nMarkAnz(rMark.GetMarkCount()); + const size_t nMarkAnz(rMark.GetMarkCount()); if(nMarkAnz) { - sal_uInt32 nm(0); std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters; if( bUndo ) { - for(nm = nMarkAnz; nm > 0;) + for(size_t nm = nMarkAnz; nm > 0;) { - nm--; + --nm; SdrMark* pM = rMark.GetMark(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -722,9 +720,9 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark) std::vector< SdrObject* > aRemoved3DObjects; - for(nm = nMarkAnz; nm > 0;) + for(size_t nm = nMarkAnz; nm > 0;) { - nm--; + --nm; SdrMark* pM = rMark.GetMark(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); SdrObjList* pOL = pObj->GetObjList(); @@ -792,10 +790,9 @@ void SdrEditView::DeleteMarkedObj() { const SdrMarkList& rMarkList = GetMarkedObjectList(); - const sal_uInt32 nCount(rMarkList.GetMarkCount()); - sal_uInt32 a(0); + const size_t nCount(rMarkList.GetMarkCount()); - for(a = 0; a < nCount; a++) + for(size_t a = 0; a < nCount; ++a) { // in the first run, add all found parents, but only once SdrMark* pMark = rMarkList.GetMark(a); @@ -826,7 +823,7 @@ void SdrEditView::DeleteMarkedObj() // in a 2nd run, remove all objects which may already be scheduled for // removal. I am not sure if this can happen, but theoretically // a to-be-removed object may already be the group/3DScene itself - for(a = 0; a < nCount; a++) + for(size_t a = 0; a < nCount; ++a) { SdrMark* pMark = rMarkList.GetMark(a); SdrObject* pObject = pMark->GetMarkedSdrObj(); @@ -883,8 +880,8 @@ void SdrEditView::CopyMarkedObj() SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList()); // The following loop is used instead of MarkList::Merge(), to be // able to flag the MarkEntries. - sal_uIntPtr nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - for (sal_uIntPtr nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) { + const size_t nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + for (size_t nEdgeNum=0; nEdgeNum<nEdgeAnz; ++nEdgeNum) { SdrMark aM(*GetEdgesOfMarkedNodes().GetMark(nEdgeNum)); aM.SetUser(1); aSourceObjectsForCopy.InsertEntry(aM); @@ -898,10 +895,9 @@ void SdrEditView::CopyMarkedObj() const bool bUndo = IsUndoEnabled(); GetMarkedObjectListWriteAccess().Clear(); - sal_uIntPtr nCloneErrCnt=0; - sal_uIntPtr nMarkAnz=aSourceObjectsForCopy.GetMarkCount(); - sal_uIntPtr nm; - for (nm=0; nm<nMarkAnz; nm++) { + size_t nCloneErrCnt=0; + const size_t nMarkAnz=aSourceObjectsForCopy.GetMarkCount(); + for (size_t nm=0; nm<nMarkAnz; ++nm) { SdrMark* pM=aSourceObjectsForCopy.GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj()->Clone(); if (pO!=NULL) { @@ -929,7 +925,7 @@ void SdrEditView::CopyMarkedObj() // New mechanism to re-create the connections of cloned connectors aCloneList.CopyConnections(); - if(0L != nCloneErrCnt) + if(nCloneErrCnt) { #ifdef DBG_UTIL OStringBuffer aStr("SdrEditView::CopyMarkedObj(): Error when cloning "); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index d8a96d92e500..81b056406827 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -71,7 +71,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense."); if (rRect.IsEmpty()) return; - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); if (nAnz==0) return; Rectangle aR0(GetMarkedObjRect()); DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() is empty."); @@ -96,7 +96,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) if (bCopy) CopyMarkedObj(); - for (sal_uIntPtr nm=0; nm<nAnz; nm++) + for (size_t nm=0; nm<nAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -194,8 +194,8 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy) if (bCopy) CopyMarkedObj(); - 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(); @@ -227,8 +227,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons if (bCopy) CopyMarkedObj(); - 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(); @@ -264,8 +264,8 @@ void SdrEditView::ResizeMultMarkedObj(const Point& rRef, if (bCopy) CopyMarkedObj(); - 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(); @@ -333,13 +333,13 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, bool bCopy) double nSin=sin(nWink*nPi180); double nCos=cos(nWink*nPi180); - const sal_uInt32 nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); if(nMarkAnz) { std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters; - for(sal_uInt32 nm(0); nm < nMarkAnz; nm++) + for(size_t nm = 0; nm < nMarkAnz; ++nm) { SdrMark* pM = GetSdrMarkByIndex(nm); SdrObject* pO = pM->GetMarkedSdrObj(); @@ -393,13 +393,13 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b if (bCopy) CopyMarkedObj(); - const sal_uInt32 nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); if(nMarkAnz) { std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters; - for(sal_uInt32 nm(0); nm < nMarkAnz; nm++) + for(size_t nm = 0; nm < nMarkAnz; ++nm) { SdrMark* pM = GetSdrMarkByIndex(nm); SdrObject* pO = pM->GetMarkedSdrObj(); @@ -455,8 +455,8 @@ long SdrEditView::GetMarkedObjShear() const bool b1st=true; bool bOk=true; long nWink=0; - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nm=0; nm<nMarkAnz && bOk; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); long nWink2=pO->GetShearAngle(); @@ -487,8 +487,8 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo CopyMarkedObj(); double nTan=tan(nWink*nPi180); - 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(); @@ -603,8 +603,8 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM if (bCopy) CopyMarkedObj(); - 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(); @@ -677,8 +677,8 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto if (bCopy) CopyMarkedObj(); - 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(); @@ -778,8 +778,8 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep const bool bUndo = IsUndoEnabled(); // TODO: check if WhichRange is necessary. - 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) { const SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -817,8 +817,8 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyH long nShrAngle=0; bool bShrAngleDC=false; Rectangle aSnapRect; Rectangle aLogicRect; - 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) { const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (nm==0) { @@ -924,9 +924,9 @@ SfxItemSet SdrEditView::GetAttrFromMarked(bool bOnlyHardAttr) const void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const { - sal_uInt32 nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); - for(sal_uInt32 a(0); a < nMarkAnz; a++) + for(size_t a = 0; a < nMarkAnz; ++a) { // #80277# merging was done wrong in the prev version const SfxItemSet& rSet = GetMarkedObjectByIndex(a)->GetMergedItemSet(); @@ -1031,7 +1031,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) BegUndo(aStr); } - const sal_uInt32 nMarkAnz(GetMarkedObjectCount()); + const size_t nMarkAnz(GetMarkedObjectCount()); std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters; // create ItemSet without SFX_ITEM_DONTCARE. Put() @@ -1053,7 +1053,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) nNewLineWidth = ((const XLineWidthItem&)aAttr.Get(XATTR_LINEWIDTH)).GetValue(); } - for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) + for (size_t nm=0; nm<nMarkAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1187,8 +1187,8 @@ SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const { SfxStyleSheet* pRet=NULL; bool b1st=true; - 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); SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet(); if (b1st) pRet=pSS; @@ -1214,8 +1214,8 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRe BegUndo(aStr); } - 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); if( bUndo ) @@ -1344,13 +1344,13 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const // check every object whether it is protected const SdrMarkList& rMarkList=GetMarkedObjectList(); - sal_uIntPtr nMarkCount=rMarkList.GetMarkCount(); + const size_t nMarkCount=rMarkList.GetMarkCount(); SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj(); bool bPosProt=pObj->IsMoveProtect(); bool bSizProt=pObj->IsResizeProtect(); bool bPosProtDontCare=false; bool bSizProtDontCare=false; - for (sal_uIntPtr i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) + for (size_t i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); ++i) { pObj=rMarkList.GetMark(i)->GetMarkedSdrObj(); if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=true; @@ -1466,7 +1466,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) long nOldRotateAngle=GetMarkedObjRotate(); long nOldShearAngle=GetMarkedObjShear(); const SdrMarkList& rMarkList=GetMarkedObjectList(); - sal_uIntPtr nMarkCount=rMarkList.GetMarkCount(); + const size_t nMarkCount=rMarkList.GetMarkCount(); SdrObject* pObj=NULL; RECT_POINT eSizePoint=RP_MM; @@ -1675,7 +1675,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) const bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); - for(sal_uInt32 i(0); i < nMarkCount; i++) + for(size_t i = 0; i < nMarkCount; ++i) { pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -1716,7 +1716,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) const bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); - for(sal_uInt32 i(0); i < nMarkCount; i++) + for(size_t i = 0; i < nMarkCount; ++i) { pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -1745,7 +1745,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) bool SdrEditView::IsAlignPossible() const { // at least two selected objects, at least one of them movable ForcePossibilities(); - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); if (nAnz==0) return false; // nothing selected! if (nAnz==1) return bMoveAllowed; // align single object to page return bOneOrMoreMovable; // otherwise: MarkCount>=2 @@ -1757,7 +1757,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool return; SortMarkedObjects(); - if (GetMarkedObjectCount()<1) + if (!GetMarkedObjectCount()) return; const bool bUndo = IsUndoEnabled(); @@ -1796,10 +1796,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool } Rectangle aBound; - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - sal_uIntPtr nm; + const size_t nMarkAnz=GetMarkedObjectCount(); bool bHasFixed=false; - for (nm=0; nm<nMarkAnz; nm++) + for (size_t nm=0; nm<nMarkAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -1816,7 +1815,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool { if (nMarkAnz==1) { // align single object to page - const SdrObject* pObj=GetMarkedObjectByIndex(0L); + const SdrObject* pObj=GetMarkedObjectByIndex(0); const SdrPage* pPage=pObj->GetPage(); const SdrPageGridFrameList* pGFL=pPage->GetGridFrameList(GetSdrPageViewOfMarkedByIndex(0),&(pObj->GetSnapRect())); const SdrPageGridFrame* pFrame=NULL; @@ -1845,7 +1844,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool } } Point aCenter(aBound.Center()); - for (nm=0; nm<nMarkAnz; nm++) + for (size_t nm=0; nm<nMarkAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 1825434d9ea3..ecbfae9baee8 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -63,7 +63,7 @@ void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, void SdrEditView::MovMarkedToTop() { - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -72,17 +72,16 @@ void SdrEditView::MovMarkedToTop() BegUndo(ImpGetResStr(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOTOP); SortMarkedObjects(); - sal_uIntPtr nm; - for (nm=0; nm<nAnz; nm++) + for (size_t nm=0; nm<nAnz; ++nm) { // All Ordnums have to be correct! GetMarkedObjectByIndex(nm)->GetOrdNum(); } bool bChg=false; SdrObjList* pOL0=NULL; sal_uIntPtr nNewPos=0; - for (nm=nAnz; nm>0;) + for (size_t nm=nAnz; nm>0;) { - nm--; + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrObjList* pOL=pObj->GetObjList(); @@ -151,7 +150,7 @@ void SdrEditView::MovMarkedToTop() void SdrEditView::MovMarkedToBtm() { - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -160,8 +159,7 @@ void SdrEditView::MovMarkedToBtm() BegUndo(ImpGetResStr(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOBTM); SortMarkedObjects(); - sal_uIntPtr nm; - for (nm=0; nm<nAnz; nm++) + for (size_t nm=0; nm<nAnz; ++nm) { // All Ordnums have to be correct! GetMarkedObjectByIndex(nm)->GetOrdNum(); } @@ -169,7 +167,7 @@ void SdrEditView::MovMarkedToBtm() bool bChg=false; SdrObjList* pOL0=NULL; sal_uIntPtr nNewPos=0; - for (nm=0; nm<nAnz; nm++) + for (size_t nm=0; nm<nAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -245,7 +243,7 @@ void SdrEditView::PutMarkedToTop() void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -258,31 +256,30 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { // Make "in front of the object" work, even if the // selected objects are already in front of the other object - sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj); + const size_t nRefMark=TryToFindMarkedObject(pRefObj); SdrMark aRefMark; - if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) + if (nRefMark!=SAL_MAX_SIZE) { aRefMark=*GetSdrMarkByIndex(nRefMark); GetMarkedObjectListWriteAccess().DeleteMark(nRefMark); } PutMarkedToBtm(); - if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) + if (nRefMark!=SAL_MAX_SIZE) { GetMarkedObjectListWriteAccess().InsertEntry(aRefMark); SortMarkedObjects(); } } - sal_uIntPtr nm; - for (nm=0; nm<nAnz; nm++) + for (size_t nm=0; nm<nAnz; ++nm) { // All Ordnums have to be correct! GetMarkedObjectByIndex(nm)->GetOrdNum(); } bool bChg=false; SdrObjList* pOL0=NULL; sal_uIntPtr nNewPos=0; - for (nm=nAnz; nm>0;) + for (size_t nm=nAnz; nm>0;) { - nm--; + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj!=pRefObj) @@ -347,7 +344,7 @@ void SdrEditView::PutMarkedToBtm() void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) { - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -360,28 +357,27 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) { // Make "behind the object" work, even if the // selected objects are already behind the other object - sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj); + const size_t nRefMark=TryToFindMarkedObject(pRefObj); SdrMark aRefMark; - if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) + if (nRefMark!=SAL_MAX_SIZE) { aRefMark=*GetSdrMarkByIndex(nRefMark); GetMarkedObjectListWriteAccess().DeleteMark(nRefMark); } PutMarkedToTop(); - if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) + if (nRefMark!=SAL_MAX_SIZE) { GetMarkedObjectListWriteAccess().InsertEntry(aRefMark); SortMarkedObjects(); } } - sal_uIntPtr nm; - for (nm=0; nm<nAnz; nm++) { // All Ordnums have to be correct! + for (size_t nm=0; nm<nAnz; ++nm) { // All Ordnums have to be correct! GetMarkedObjectByIndex(nm)->GetOrdNum(); } bool bChg=false; SdrObjList* pOL0=NULL; sal_uIntPtr nNewPos=0; - for (nm=0; nm<nAnz; nm++) { + for (size_t nm=0; nm<nAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj!=pRefObj) { @@ -428,7 +424,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) void SdrEditView::ReverseOrderOfMarked() { SortMarkedObjects(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + const size_t nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz>0) { bool bChg=false; @@ -437,14 +433,14 @@ void SdrEditView::ReverseOrderOfMarked() if( bUndo ) BegUndo(ImpGetResStr(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_REVORDER); - sal_uIntPtr a=0; + size_t a=0; do { // take into account selection across multiple PageViews - sal_uIntPtr b=a+1; - while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) b++; - b--; + size_t b=a+1; + while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) ++b; + --b; SdrObjList* pOL=GetSdrPageViewOfMarkedByIndex(a)->GetObjList(); - sal_uIntPtr c=b; + size_t c=b; if (a<c) { // make sure OrdNums aren't dirty GetMarkedObjectByIndex(a)->GetOrdNum(); } @@ -462,7 +458,8 @@ void SdrEditView::ReverseOrderOfMarked() // Obj 2 has moved forward by one position, so now nOrd2-1 pOL->SetObjectOrdNum(nOrd2-1,nOrd1); // use Replace instead of SetOrdNum for performance reasons (recalculation of Ordnums) - a++; c--; + ++a; + --c; bChg=true; } a=b+1; @@ -478,7 +475,7 @@ void SdrEditView::ReverseOrderOfMarked() void SdrEditView::ImpCheckToTopBtmPossible() { - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); if (nAnz==0) return; if (nAnz==1) @@ -501,10 +498,9 @@ void SdrEditView::ImpCheckToTopBtmPossible() bToTopPossible=nObjNum<sal_uIntPtr(nMax-1); bToBtmPossible=nObjNum>nMin; } else { // multiple selection - sal_uIntPtr nm=0; SdrObjList* pOL0=NULL; long nPos0=-1; - while (!bToBtmPossible && nm<nAnz) { // check 'send to background' + for (size_t nm = 0; !bToBtmPossible && nm<nAnz; ++nm) { // check 'send to background' SdrObject* pObj=GetMarkedObjectByIndex(nm); SdrObjList* pOL=pObj->GetObjList(); if (pOL!=pOL0) { @@ -514,13 +510,12 @@ void SdrEditView::ImpCheckToTopBtmPossible() sal_uIntPtr nPos=pObj->GetOrdNum(); bToBtmPossible=nPos>sal_uIntPtr(nPos0+1); nPos0=long(nPos); - nm++; } - nm=nAnz; + pOL0=NULL; nPos0=0x7FFFFFFF; - while (!bToTopPossible && nm>0) { // check 'bring to front' - nm--; + for (size_t nm=nAnz; !bToTopPossible && nm>0; ) { // check 'bring to front' + --nm; SdrObject* pObj=GetMarkedObjectByIndex(nm); SdrObjList* pOL=pObj->GetObjList(); if (pOL!=pOL0) { @@ -764,7 +759,7 @@ typedef vector< ImpDistributeEntry*> ImpDistributeEntryList; void SdrEditView::DistributeMarkedObjects() { - sal_uInt32 nMark(GetMarkedObjectCount()); + const size_t nMark(GetMarkedObjectCount()); if(nMark > 2) { @@ -795,7 +790,7 @@ void SdrEditView::DistributeMarkedObjects() // build sorted entry list nFullLength = 0L; - for( sal_uInt32 a = 0; a < nMark; a++ ) + for( size_t a = 0; a < nMark; ++a ) { SdrMark* pMark = GetSdrMarkByIndex(a); ImpDistributeEntry* pNew = new ImpDistributeEntry; @@ -890,7 +885,7 @@ void SdrEditView::DistributeMarkedObjects() // build sorted entry list nFullLength = 0L; - for( sal_uInt32 a = 0; a < nMark; a++ ) + for( size_t a = 0; a < nMark; ++a ) { SdrMark* pMark = GetSdrMarkByIndex(a); ImpDistributeEntry* pNew = new ImpDistributeEntry; @@ -1020,7 +1015,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) ConvertMarkedToPathObj(true); OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)"); - for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) + for(size_t a=0; a<GetMarkedObjectCount(); ++a) { SdrMark* pM = GetSdrMarkByIndex(a); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1222,12 +1217,11 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) sal_uInt32 nInsPos(0xFFFFFFFF); SdrObjList* pInsOL = 0L; SdrPageView* pInsPV = 0L; - const sal_uInt32 nAnz(GetMarkedObjectCount()); const SdrObject* pAttrObj = 0L; - for(sal_uInt32 a(nAnz); a > 0L; ) + for(size_t a = GetMarkedObjectCount(); a; ) { - a--; + --a; SdrMark* pM = GetSdrMarkByIndex(a); SdrObject* pObj = pM->GetMarkedSdrObj(); SdrObjList* pThisOL = pObj->GetObjList(); @@ -1620,11 +1614,9 @@ void SdrEditView::DismantleMarkedObjects(bool bMakeLines) BegUndo("", "", bMakeLines ? SDRREPFUNC_OBJ_DISMANTLE_LINES : SDRREPFUNC_OBJ_DISMANTLE_POLYS); } - sal_uIntPtr nm; - sal_uIntPtr nAnz=GetMarkedObjectCount(); SdrObjList* pOL0=NULL; - for (nm=nAnz; nm>0;) { - nm--; + for (size_t nm=GetMarkedObjectCount(); nm>0;) { + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); @@ -1677,11 +1669,10 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) { BegUndo(ImpGetResStr(STR_EditGroup),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_GROUP); - const sal_uIntPtr nAnz = GetMarkedObjectCount(); - for(sal_uIntPtr nm = nAnz; nm>0; ) + for(size_t nm = GetMarkedObjectCount(); nm>0; ) { // add UndoActions for all affected objects - nm--; + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); std::vector< SdrUndoAction* > vConnectorUndoActions( CreateConnectorUndo( *pObj ) ); @@ -1710,9 +1701,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) // the group object is the last one in the list. sal_uIntPtr nInsPos=pSrcLst->GetObjCount(); bool bNeedInsPos=true; - for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) + for (size_t nm=GetMarkedObjectCount(); nm>0;) { - nm--; + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); if (pM->GetPageView()==pPV) { @@ -1794,12 +1785,12 @@ void SdrEditView::UnGroupMarked() if( bUndo ) BegUndo("", "", SDRREPFUNC_OBJ_UNGROUP); - sal_uIntPtr nCount=0; + size_t nCount=0; OUString aName1; OUString aName; bool bNameOk=false; - for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { - nm--; + for (size_t nm=GetMarkedObjectCount(); nm>0;) { + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pGrp=pM->GetMarkedSdrObj(); SdrObjList* pSrcLst=pGrp->GetSubList(); @@ -1912,7 +1903,7 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea) { bool bMrkChg=false; if (AreObjectsMarked()) { - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + const size_t nMarkAnz=GetMarkedObjectCount(); sal_uInt16 nDscrID=0; if(bLineToArea) { @@ -1935,8 +1926,8 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea) BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPOLY); } } - for (sal_uIntPtr nm=nMarkAnz; nm>0;) { - nm--; + for (size_t nm=nMarkAnz; nm>0;) { + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); @@ -1985,9 +1976,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) SortMarkedObjects(); SdrMarkList aForTheDescription; SdrMarkList aNewMarked; - sal_uIntPtr nAnz=GetMarkedObjectCount(); + const size_t nAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nm=nAnz; nm>0;) + for (size_t nm=nAnz; nm>0;) { // create Undo objects for all new objects // check for cancellation between the metafiles if( pProgrInfo != NULL ) @@ -1997,7 +1988,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) break; } - nm--; + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); @@ -2091,7 +2082,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) if(aNewMarked.GetMarkCount()) { // create new selection - for(sal_uIntPtr a(0); a < aNewMarked.GetMarkCount(); a++) + for(size_t a = 0; a < aNewMarked.GetMarkCount(); ++a) { GetMarkedObjectListWriteAccess().InsertEntry(*aNewMarked.GetMark(a)); } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 397ebe79b5d7..8210d3ac41b1 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1407,9 +1407,9 @@ sal_uInt16 SdrObjEditView::GetScriptType() const } else { - sal_uInt32 nMarkCount( GetMarkedObjectCount() ); + const size_t nMarkCount( GetMarkedObjectCount() ); - for( sal_uInt32 i = 0; i < nMarkCount; i++ ) + for( size_t i = 0; i < nMarkCount; ++i ) { OutlinerParaObject* pParaObj = GetMarkedObjectByIndex( i )->GetOutlinerParaObject(); @@ -1984,7 +1984,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor return true; const SdrMarkList& rMarkList = GetMarkedObjectList(); - if( rMarkList.GetMarkCount() >= 1 ) + if( rMarkList.GetMarkCount() > 0 ) { OutlinerView* pOLV = GetTextEditOutlinerView(); diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 0ea7c0b2c985..e6947d92b9f5 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -49,8 +49,8 @@ SdrGlueEditView::~SdrGlueEditView() void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { - 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(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); @@ -232,8 +232,8 @@ void SdrGlueEditView::DeleteMarkedGluePoints() if( bUndo ) BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_DELETE); - 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(); @@ -277,8 +277,8 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() if( bUndo ) BegUndo(); - 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(); @@ -322,8 +322,8 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { - 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(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 9830fab3a695..269a22dc9f19 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1842,19 +1842,19 @@ extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 void SdrHdlList::TravelFocusHdl(bool bForward) { // security correction - if(mnFocusIndex != CONTAINER_ENTRY_NOTFOUND && mnFocusIndex >= GetHdlCount()) - mnFocusIndex = CONTAINER_ENTRY_NOTFOUND; + if (mnFocusIndex >= GetHdlCount()) + mnFocusIndex = SAL_MAX_SIZE; if(!aList.empty()) { // take care of old handle - const sal_uIntPtr nOldHdlNum(mnFocusIndex); + const size_t nOldHdlNum(mnFocusIndex); SdrHdl* pOld = GetHdl(nOldHdlNum); if(pOld) { // switch off old handle - mnFocusIndex = CONTAINER_ENTRY_NOTFOUND; + mnFocusIndex = SAL_MAX_SIZE; pOld->Touch(); } @@ -1862,8 +1862,7 @@ void SdrHdlList::TravelFocusHdl(bool bForward) boost::scoped_array<ImplHdlAndIndex> pHdlAndIndex(new ImplHdlAndIndex[aList.size()]); // build sorted handle list - sal_uInt32 a; - for( a = 0; a < aList.size(); a++) + for( size_t a = 0; a < aList.size(); ++a) { pHdlAndIndex[a].mpHdl = aList[a]; pHdlAndIndex[a].mnIndex = a; @@ -1872,11 +1871,11 @@ void SdrHdlList::TravelFocusHdl(bool bForward) qsort(pHdlAndIndex.get(), aList.size(), sizeof(ImplHdlAndIndex), ImplSortHdlFunc); // look for old num in sorted array - sal_uIntPtr nOldHdl(nOldHdlNum); + size_t nOldHdl(nOldHdlNum); - if(nOldHdlNum != CONTAINER_ENTRY_NOTFOUND) + if(nOldHdlNum != SAL_MAX_SIZE) { - for(a = 0; a < aList.size(); a++) + for(size_t a = 0; a < aList.size(); ++a) { if(pHdlAndIndex[a].mpHdl == pOld) { @@ -1887,17 +1886,17 @@ void SdrHdlList::TravelFocusHdl(bool bForward) } // build new HdlNum - sal_uIntPtr nNewHdl(nOldHdl); + size_t nNewHdl(nOldHdl); // do the focus travel if(bForward) { - if(nOldHdl != CONTAINER_ENTRY_NOTFOUND) + if(nOldHdl != SAL_MAX_SIZE) { if(nOldHdl == aList.size() - 1) { // end forward run - nNewHdl = CONTAINER_ENTRY_NOTFOUND; + nNewHdl = SAL_MAX_SIZE; } else { @@ -1913,7 +1912,7 @@ void SdrHdlList::TravelFocusHdl(bool bForward) } else { - if(nOldHdl == CONTAINER_ENTRY_NOTFOUND) + if(nOldHdl == SAL_MAX_SIZE) { // start backward run at last entry nNewHdl = aList.size() - 1; @@ -1924,7 +1923,7 @@ void SdrHdlList::TravelFocusHdl(bool bForward) if(nOldHdl == 0) { // end backward run - nNewHdl = CONTAINER_ENTRY_NOTFOUND; + nNewHdl = SAL_MAX_SIZE; } else { @@ -1938,11 +1937,11 @@ void SdrHdlList::TravelFocusHdl(bool bForward) sal_uIntPtr nNewHdlNum(nNewHdl); // look for old num in sorted array - if(nNewHdl != CONTAINER_ENTRY_NOTFOUND) + if(nNewHdl != SAL_MAX_SIZE) { SdrHdl* pNew = pHdlAndIndex[nNewHdl].mpHdl; - for(a = 0; a < aList.size(); a++) + for(size_t a = 0; a < aList.size(); ++a) { if(aList[a] == pNew) { @@ -1968,7 +1967,7 @@ void SdrHdlList::TravelFocusHdl(bool bForward) SdrHdl* SdrHdlList::GetFocusHdl() const { - if(mnFocusIndex != CONTAINER_ENTRY_NOTFOUND && mnFocusIndex < GetHdlCount()) + if(mnFocusIndex < GetHdlCount()) return GetHdl(mnFocusIndex); else return 0L; @@ -1982,9 +1981,9 @@ void SdrHdlList::SetFocusHdl(SdrHdl* pNew) if(!pActual || pActual != pNew) { - sal_uIntPtr nNewHdlNum = GetHdlNum(pNew); + const size_t nNewHdlNum = GetHdlNum(pNew); - if(nNewHdlNum != CONTAINER_ENTRY_NOTFOUND) + if(nNewHdlNum != SAL_MAX_SIZE) { mnFocusIndex = nNewHdlNum; @@ -2007,7 +2006,7 @@ void SdrHdlList::ResetFocusHdl() { SdrHdl* pHdl = GetFocusHdl(); - mnFocusIndex = CONTAINER_ENTRY_NOTFOUND; + mnFocusIndex = SAL_MAX_SIZE; if(pHdl) { @@ -2018,7 +2017,7 @@ void SdrHdlList::ResetFocusHdl() SdrHdlList::SdrHdlList(SdrMarkView* pV) -: mnFocusIndex(CONTAINER_ENTRY_NOTFOUND), +: mnFocusIndex(SAL_MAX_SIZE), pView(pV), aList() { @@ -2041,7 +2040,7 @@ void SdrHdlList::SetHdlSize(sal_uInt16 nSiz) nHdlSize = nSiz; // propagate change to IAOs - for(sal_uIntPtr i=0; i<GetHdlCount(); i++) + for(size_t i=0; i<GetHdlCount(); ++i) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2057,7 +2056,7 @@ void SdrHdlList::SetMoveOutside(bool bOn) bMoveOutside = bOn ? 1 : 0; // propagate change to IAOs - for(sal_uIntPtr i=0; i<GetHdlCount(); i++) + for(size_t i=0; i<GetHdlCount(); ++i) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2075,7 +2074,7 @@ void SdrHdlList::SetDistortShear(bool bOn) bDistortShear = bOn ? 1 : 0; } -SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum) +SdrHdl* SdrHdlList::RemoveHdl(size_t nNum) { SdrHdl* pRetval = aList[nNum]; aList.erase(aList.begin() + nNum); @@ -2100,7 +2099,7 @@ void SdrHdlList::RemoveAllByKind(SdrHdlKind eKind) void SdrHdlList::Clear() { - for (sal_uIntPtr i=0; i<GetHdlCount(); i++) + for (size_t i=0; i<GetHdlCount(); ++i) { SdrHdl* pHdl=GetHdl(i); delete pHdl; @@ -2136,13 +2135,13 @@ void SdrHdlList::Sort() } } -sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const +size_t SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const { if (pHdl==NULL) - return CONTAINER_ENTRY_NOTFOUND; + return SAL_MAX_SIZE; std::deque<SdrHdl*>::const_iterator it = std::find( aList.begin(), aList.end(), pHdl); if( it == aList.end() ) - return CONTAINER_ENTRY_NOTFOUND; + return SAL_MAX_SIZE; return it - aList.begin(); } @@ -2165,8 +2164,8 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, bool bAtBegin) SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrHdl* pHdl0) const { SdrHdl* pRet=NULL; - sal_uIntPtr nAnz=GetHdlCount(); - sal_uIntPtr nNum=bBack ? 0 : nAnz; + const size_t nAnz=GetHdlCount(); + size_t nNum=bBack ? 0 : nAnz; while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL) { if (!bBack) @@ -2191,7 +2190,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrH SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const { SdrHdl* pRet=NULL; - for (sal_uIntPtr i=0; i<GetHdlCount() && pRet==NULL; i++) + for (size_t i=0; i<GetHdlCount() && pRet==NULL; ++i) { SdrHdl* pHdl=GetHdl(i); if (pHdl->GetKind()==eKind1) diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index d572a4009d61..6b2b419c80e5 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -73,7 +73,7 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod void SdrObjListIter::ImpProcessMarkList( const SdrMarkList& rMarkList, SdrIterMode eMode ) { - for( sal_uIntPtr nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx ) + for( size_t nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx ) if( SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj() ) ImpProcessObj( pObj, eMode, false ); } diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 2908b83070e4..784dfa3395b8 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -254,7 +254,7 @@ void SdrMarkList::ImpForceSort() if(!mbSorted) { mbSorted = true; - sal_uLong nAnz = maList.size(); + size_t nAnz = maList.size(); // remove invalid if(nAnz > 0 ) @@ -281,8 +281,7 @@ void SdrMarkList::ImpForceSort() if(maList.size() > 1) { SdrMark* pAkt = maList.back(); - int i = maList.size() - 2; - while(i) + for (size_t i = maList.size() - 2; i; --i) { SdrMark* pCmp = maList[i]; if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj() && pAkt->GetMarkedSdrObj()) @@ -303,8 +302,6 @@ void SdrMarkList::ImpForceSort() { pAkt = pCmp; } - - --i; } } } @@ -313,7 +310,7 @@ void SdrMarkList::ImpForceSort() void SdrMarkList::Clear() { - for(sal_uLong i(0L); i < GetMarkCount(); i++) + for(size_t i = 0; i < GetMarkCount(); ++i) { SdrMark* pMark = GetMark(i); delete pMark; @@ -327,7 +324,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst) { Clear(); - for(sal_uLong i(0L); i < rLst.GetMarkCount(); i++) + for(size_t i = 0; i < rLst.GetMarkCount(); ++i) { SdrMark* pMark = rLst.GetMark(i); SdrMark* pNeuMark = new SdrMark(*pMark); @@ -343,12 +340,12 @@ void SdrMarkList::operator=(const SdrMarkList& rLst) mbSorted = rLst.mbSorted; } -SdrMark* SdrMarkList::GetMark(sal_uLong nNum) const +SdrMark* SdrMarkList::GetMark(size_t nNum) const { return (nNum < maList.size()) ? maList[nNum] : NULL; } -sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const +size_t SdrMarkList::FindObject(const SdrObject* pObj) const { // Since relying on OrdNums is not allowed for the selection because objects in the // selection may not be inserted in a list if they are e.g. modified ATM, i changed @@ -361,7 +358,7 @@ sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const // less dangerous to change this method then changing SdrObject::GetOrdNum(). if(pObj && !maList.empty()) { - for(sal_uLong a(0L); a < maList.size(); a++) + for(size_t a = 0; a < maList.size(); ++a) { if(maList[a]->GetMarkedSdrObj() == pObj) { @@ -370,13 +367,13 @@ sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const } } - return CONTAINER_ENTRY_NOTFOUND; + return SAL_MAX_SIZE; } void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) { SetNameDirty(); - sal_uLong nAnz(maList.size()); + const size_t nAnz(maList.size()); if(!bChkSort || !mbSorted || nAnz == 0) { @@ -387,7 +384,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) } else { - SdrMark* pLast = GetMark(sal_uLong(nAnz - 1)); + SdrMark* pLast = GetMark(nAnz - 1); const SdrObject* pLastObj = pLast->GetMarkedSdrObj(); const SdrObject* pNeuObj = rMark.GetMarkedSdrObj(); @@ -432,7 +429,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) return; } -void SdrMarkList::DeleteMark(sal_uLong nNum) +void SdrMarkList::DeleteMark(size_t nNum) { SdrMark* pMark = GetMark(nNum); DBG_ASSERT(pMark!=0L,"DeleteMark: MarkEntry not found."); @@ -445,7 +442,7 @@ void SdrMarkList::DeleteMark(sal_uLong nNum) } } -void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum) +void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, size_t nNum) { SdrMark* pMark = GetMark(nNum); DBG_ASSERT(pMark!=0L,"ReplaceMark: MarkEntry not found."); @@ -462,7 +459,7 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum) void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse) { - sal_uLong nAnz(rSrcList.maList.size()); + const size_t nAnz(rSrcList.maList.size()); if(rSrcList.mbSorted) { @@ -472,7 +469,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse) if(!bReverse) { - for(sal_uLong i(0L); i < nAnz; i++) + for(size_t i = 0; i < nAnz; ++i) { SdrMark* pM = rSrcList.maList[i]; InsertEntry(*pM); @@ -480,9 +477,9 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse) } else { - for(sal_uLong i(nAnz); i > 0;) + for(size_t i = nAnz; i > 0;) { - i--; + --i; SdrMark* pM = rSrcList.maList[i]; InsertEntry(*pM); } @@ -538,7 +535,7 @@ bool SdrMarkList::InsertPageView(const SdrPageView& rPV) const OUString& SdrMarkList::GetMarkDescription() const { - sal_uLong nAnz(GetMarkCount()); + const size_t nAnz(GetMarkCount()); if(mbNameOk && 1L == nAnz) { @@ -575,7 +572,7 @@ const OUString& SdrMarkList::GetMarkDescription() const aNam = pMark->GetMarkedSdrObj()->TakeObjNamePlural(); bool bEq(true); - for(sal_uLong i = 1; i < GetMarkCount() && bEq; i++) + for(size_t i = 1; i < GetMarkCount() && bEq; ++i) { SdrMark* pMark2 = GetMark(i); OUString aStr1(pMark2->GetMarkedSdrObj()->TakeObjNamePlural()); @@ -602,20 +599,20 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const { bool& rNameOk = (bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk); OUString& rName = const_cast<OUString&>(bGlue ? maGluePointName : maPointName); - sal_uLong nMarkAnz(GetMarkCount()); - sal_uLong nMarkPtAnz(0L); - sal_uLong nMarkPtObjAnz(0L); - sal_uLong n1stMarkNum(ULONG_MAX); + const size_t nMarkAnz(GetMarkCount()); + size_t nMarkPtAnz(0); + size_t nMarkPtObjAnz(0); + size_t n1stMarkNum(SAL_MAX_SIZE); - for(sal_uLong nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) + for(size_t nMarkNum = 0; nMarkNum < nMarkAnz; ++nMarkNum) { const SdrMark* pMark = GetMark(nMarkNum); const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints(); - sal_uLong nAnz(pPts ? pPts->size() : 0); + const size_t nAnz(pPts ? pPts->size() : 0); if(nAnz) { - if(n1stMarkNum == ULONG_MAX) + if(n1stMarkNum == SAL_MAX_SIZE) { n1stMarkNum = nMarkNum; } @@ -631,7 +628,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const } } - if(rNameOk && 1L == nMarkPtObjAnz) + if(rNameOk && 1 == nMarkPtObjAnz) { // if it's a single selection, cache only text frame const SdrObject* pObj = GetMark(0)->GetMarkedSdrObj(); @@ -669,7 +666,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const bool bEq(true); - for(sal_uLong i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) + for(size_t i = n1stMarkNum + 1; i < GetMarkCount() && bEq; ++i) { const SdrMark* pMark2 = GetMark(i); const SdrUShortCont* pPts = bGlue ? pMark2->GetMarkedGluePoints() : pMark2->GetMarkedPoints(); @@ -714,7 +711,7 @@ bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const bool bFnd(false); Rectangle aR; - for(sal_uLong i(0L); i < GetMarkCount(); i++) + for(size_t i = 0; i < GetMarkCount(); ++i) { SdrMark* pMark = GetMark(i); @@ -744,7 +741,7 @@ bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const { bool bFnd(false); - for(sal_uLong i(0L); i < GetMarkCount(); i++) + for(size_t i = 0; i < GetMarkCount(); ++i) { SdrMark* pMark = GetMark(i); @@ -855,9 +852,9 @@ namespace sdr maAllMarkedObjects.clear(); // GetMarkCount after ForceSort - const sal_uLong nMarkAnz(maMarkedObjectList.GetMarkCount()); + const size_t nMarkAnz(maMarkedObjectList.GetMarkCount()); - for(sal_uLong a(0L); a < nMarkAnz; a++) + for(size_t a = 0; a < nMarkAnz; ++a) { SdrObject* pCandidate = maMarkedObjectList.GetMark(a)->GetMarkedSdrObj(); @@ -894,7 +891,7 @@ namespace sdr aM.SetCon2(true); } - if(CONTAINER_ENTRY_NOTFOUND == maMarkedObjectList.FindObject(pEdge)) + if(SAL_MAX_SIZE == maMarkedObjectList.FindObject(pEdge)) { // check if it itself is selected maEdgesOfMarkedNodes.InsertEntry(aM); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index acfbcab68ad0..2dff6dc6f9b1 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -559,8 +559,8 @@ void SdrMarkView::showMarkHandles() bool SdrMarkView::ImpIsFrameHandles() const { - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; + const size_t nMarkAnz=GetMarkedObjectCount(); + bool bFrmHdl=nMarkAnz>static_cast<size_t>(nFrameHandlesLimit) || bForceFrameHandles; bool bStdDrag=eDragMode==SDRDRAG_MOVE; if (nMarkAnz==1 && bStdDrag && bFrmHdl) { @@ -579,7 +579,7 @@ bool SdrMarkView::ImpIsFrameHandles() const bFrmHdl=true; if (eDragMode==SDRDRAG_ROTATE) { // when rotating, use ObjOwn drag, if there's at least 1 PolyObj - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) { + for (size_t nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->IsPolyObj(); @@ -588,7 +588,7 @@ bool SdrMarkView::ImpIsFrameHandles() const } if (!bFrmHdl) { // FrameHandles, if at least 1 Obj can't do SpecialDrag - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) { + for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->hasSpecialDrag(); @@ -635,7 +635,7 @@ void SdrMarkView::SetMarkHandles() // are handles enabled at all? Create only then if(!areMarkHandlesHidden()) { - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + const size_t nMarkAnz=GetMarkedObjectCount(); bool bStdDrag=eDragMode==SDRDRAG_MOVE; bool bSingleTextObjMark=false; @@ -654,7 +654,7 @@ void SdrMarkView::SetMarkHandles() { pMarkedPV=GetSdrPageViewOfMarkedByIndex(0); - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++) + for (size_t nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -708,10 +708,10 @@ void SdrMarkView::SetMarkHandles() { // otherwise nothing is found if( bSingleTextObjMark ) { - const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); + const size_t nSiz0=aHdl.GetHdlCount(); pMarkedObj->AddToHdlList(aHdl); - const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); - for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) + const size_t nSiz1=aHdl.GetHdlCount(); + for (size_t i=nSiz0; i<nSiz1; ++i) { SdrHdl* pHdl=aHdl.GetHdl(i); pHdl->SetObj(pMarkedObj); @@ -765,17 +765,17 @@ void SdrMarkView::SetMarkHandles() if(!bDone) { - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); - const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); + const size_t nSiz0=aHdl.GetHdlCount(); pObj->AddToHdlList(aHdl); - const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); + const size_t nSiz1=aHdl.GetHdlCount(); bool bPoly=pObj->IsPolyObj(); const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints(); - for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) + for (size_t i=nSiz0; i<nSiz1; ++i) { SdrHdl* pHdl=aHdl.GetHdl(i); pHdl->SetPos( pHdl->GetPos() + aGridOff ); @@ -810,7 +810,7 @@ void SdrMarkView::SetMarkHandles() } // GluePoint handles - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -853,7 +853,7 @@ void SdrMarkView::SetMarkHandles() // try to restore focus handle index from remembered values if(bSaveOldFocus) { - for(sal_uInt32 a(0); a < aHdl.GetHdlCount(); a++) + for(size_t a = 0; a < aHdl.GetHdlCount(); ++a) { SdrHdl* pCandidate = aHdl.GetHdl(a); @@ -923,7 +923,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SDRDRAG_TRANSPARENCE: { // add interactive transparency handle - sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); + const size_t nMarkAnz = GetMarkedObjectCount(); if(nMarkAnz == 1) { SdrObject* pObj = GetMarkedObjectByIndex(0); @@ -987,7 +987,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SDRDRAG_GRADIENT: { // add interactive gradient handle - sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); + const size_t nMarkAnz = GetMarkedObjectCount(); if(nMarkAnz == 1) { SdrObject* pObj = GetMarkedObjectByIndex(0); @@ -1049,9 +1049,9 @@ bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) } // notify last mouse over handle that he lost the mouse - const sal_uIntPtr nHdlCount = aHdl.GetHdlCount(); + const size_t nHdlCount = aHdl.GetHdlCount(); - for(sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ ) + for(size_t nHdl = 0; nHdl < nHdlCount; ++nHdl) { SdrHdl* pCurrentHdl = GetHdl(nHdl); if( pCurrentHdl->mbMouseOver ) @@ -1188,8 +1188,8 @@ void SdrMarkView::SetRef2(const Point& rPt) void SdrMarkView::CheckMarked() { - for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { - nm--; + for (size_t nm=GetMarkedObjectCount(); nm>0;) { + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); @@ -1299,7 +1299,7 @@ bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const bool bRet=false; nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); - for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) { + for (size_t nm=0; nm<GetMarkedObjectCount() && !bRet; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); bRet = 0 != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0); } @@ -1342,11 +1342,11 @@ bool SdrMarkView::MarkNextObj(bool bPrev) } SortMarkedObjects(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - sal_uIntPtr nChgMarkNum = ULONG_MAX; // number of the MarkEntry we want to replace + const size_t nMarkAnz=GetMarkedObjectCount(); + size_t nChgMarkNum = SAL_MAX_SIZE; // number of the MarkEntry we want to replace sal_uIntPtr nSearchObjNum = bPrev ? 0 : ULONG_MAX; if (nMarkAnz!=0) { - nChgMarkNum=bPrev ? 0 : sal_uIntPtr(nMarkAnz-1); + nChgMarkNum=bPrev ? 0 : nMarkAnz-1; SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum); OSL_ASSERT(pM!=NULL); if (pM->GetMarkedSdrObj() != NULL) @@ -1365,7 +1365,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev) SdrObject* pSearchObj = pSearchObjList->GetObjectForNavigationPosition(nSearchObjNum); if (IsObjMarkable(pSearchObj,pPageView)) { - if (TryToFindMarkedObject(pSearchObj)==CONTAINER_ENTRY_NOTFOUND) + if (TryToFindMarkedObject(pSearchObj)==SAL_MAX_SIZE) { pMarkObj=pSearchObj; } @@ -1379,7 +1379,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev) return false; } - if (nChgMarkNum!=ULONG_MAX) + if (nChgMarkNum!=SAL_MAX_SIZE) { GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum); } @@ -1394,13 +1394,12 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) Point aPt(rPnt); SdrMark* pTopMarkHit=NULL; SdrMark* pBtmMarkHit=NULL; - sal_uIntPtr nTopMarkHit=0; - sal_uIntPtr nBtmMarkHit=0; + size_t nTopMarkHit=0; + size_t nBtmMarkHit=0; // find topmost of the selected objects that is hit by rPnt - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - sal_uIntPtr nm=0; - for (nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) { - nm--; + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) { + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0)) { @@ -1416,7 +1415,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) SdrPageView* pPV=pTopMarkHit->GetPageView(); // find lowermost of the selected objects that is hit by rPnt // and is placed on the same PageView as pTopMarkHit - for (nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; nm++) { + for (size_t nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrPageView* pPV2=pM->GetPageView(); if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,0,0)) @@ -1476,7 +1475,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0)) { - if (TryToFindMarkedObject(pObj)==CONTAINER_ENTRY_NOTFOUND) { + if (TryToFindMarkedObject(pObj)==SAL_MAX_SIZE) { pFndObj=pObj; } else { // TODO: for performance reasons set on to Top or Btm, if necessary @@ -1519,8 +1518,8 @@ bool SdrMarkView::MarkObj(const Rectangle& rRect, bool bUnmark) bFnd=true; } } else { - sal_uIntPtr nPos=TryToFindMarkedObject(pObj); - if (nPos!=CONTAINER_ENTRY_NOTFOUND) + const size_t nPos=TryToFindMarkedObject(pObj); + if (nPos!=SAL_MAX_SIZE) { GetMarkedObjectListWriteAccess().DeleteMark(nPos); bFnd=true; @@ -1547,8 +1546,8 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool } else { - sal_uIntPtr nPos=TryToFindMarkedObject(pObj); - if (nPos!=CONTAINER_ENTRY_NOTFOUND) + const size_t nPos=TryToFindMarkedObject(pObj); + if (nPos!=SAL_MAX_SIZE) { GetMarkedObjectListWriteAccess().DeleteMark(nPos); } @@ -1562,10 +1561,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool bool SdrMarkView::IsObjMarked(SdrObject* pObj) const { - // Hack: Because FindObject() is not const, - // I have to cast myself to non-const. - sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); - return nPos!=CONTAINER_ENTRY_NOTFOUND; + return TryToFindMarkedObject(pObj)!=SAL_MAX_SIZE; } sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const @@ -1683,7 +1679,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT { if ((pMarkList)!=NULL) { - if ((*pMarkList).FindObject(pObj)!=CONTAINER_ENTRY_NOTFOUND) + if ((*pMarkList).FindObject(pObj)!=SAL_MAX_SIZE) { return NULL; } @@ -1702,7 +1698,7 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL); } -bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const +bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, size_t* pnMarkNum, sal_uInt16* pnPassNum) const { // TODO: lacks a Pass2,Pass3 SortMarkedObjects(); if (ppRootObj!=NULL) *ppRootObj=NULL; @@ -1730,8 +1726,8 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP pPV=((SdrObjEditView*)this)->GetTextEditPageView(); } if (bMarked) { - sal_uIntPtr nMrkAnz=GetMarkedObjectCount(); - sal_uIntPtr nMrkNum=bBack ? 0 : nMrkAnz; + const size_t nMrkAnz=GetMarkedObjectCount(); + size_t nMrkNum=bBack ? 0 : nMrkAnz; while (pHitObj==NULL && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) { if (!bBack) nMrkNum--; SdrMark* pM=GetSdrMarkByIndex(nMrkNum); @@ -1821,7 +1817,7 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP return rpObj!=NULL; } -bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const +bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, size_t* pnMarkNum, sal_uIntPtr nOptions) const { SortMarkedObjects(); bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; @@ -1832,10 +1828,9 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie Point aPt(rPnt); sal_uInt16 nTol=(sal_uInt16)nHitTolLog; bool bFnd=false; - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - sal_uIntPtr nMarkNum; - for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { - nMarkNum--; + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { + --nMarkNum; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrPageView* pPV=pM->GetPageView(); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -1849,10 +1844,10 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie if ((bBoundCheckOn2ndPass || bCheckNearestOn3rdPass) && !bFnd) { SdrObject* pBestObj=NULL; SdrPageView* pBestPV=NULL; - sal_uIntPtr nBestMarkNum=0; + size_t nBestMarkNum=0; sal_uIntPtr nBestDist=ULONG_MAX; - for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { - nMarkNum--; + for (size_t nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { + --nMarkNum; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrPageView* pPV=pM->GetPageView(); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -1946,7 +1941,7 @@ void SdrMarkView::AdjustMarkHdl() Rectangle SdrMarkView::GetMarkedObjBoundRect() const { Rectangle aRect; - for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { + for (size_t nm=0; nm<GetMarkedObjectCount(); ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); Rectangle aR1(pO->GetCurrentBoundRect()); @@ -1976,7 +1971,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const ((SdrMarkView*)this)->bMarkedObjRectDirty=false; Rectangle aRect; Rectangle aRect2; - for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { + for (size_t nm=0; nm<GetMarkedObjectCount(); ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); Rectangle aR1(pO->GetSnapRect()); @@ -2034,9 +2029,9 @@ bool SdrMarkView::EnterMarkedGroup() if(pPV) { bool bEnter=false; - for (sal_uInt32 nm(GetMarkedObjectCount()); nm > 0 && !bEnter;) + for (size_t nm = GetMarkedObjectCount(); nm > 0 && !bEnter;) { - nm--; + --nm; SdrMark* pM=GetSdrMarkByIndex(nm); if (pM->GetPageView()==pPV) { SdrObject* pObj=pM->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index e024082c218b..06580daa7f2b 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -35,9 +35,9 @@ bool SdrMarkView::HasMarkablePoints() const ForceUndirtyMrkPnt(); bool bRet=false; if (!ImpIsFrameHandles()) { - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - if (nMarkAnz<=nFrameHandlesLimit) { - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) { + for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bRet=pObj->IsPolyObj(); @@ -52,9 +52,9 @@ sal_uIntPtr SdrMarkView::GetMarkablePointCount() const ForceUndirtyMrkPnt(); sal_uIntPtr nAnz=0; if (!ImpIsFrameHandles()) { - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - if (nMarkAnz<=nFrameHandlesLimit) { - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) { + for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsPolyObj()) { @@ -71,9 +71,9 @@ bool SdrMarkView::HasMarkedPoints() const ForceUndirtyMrkPnt(); bool bRet=false; if (!ImpIsFrameHandles()) { - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - if (nMarkAnz<=nFrameHandlesLimit) { - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) { + for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); bRet=pPts!=NULL && !pPts->empty(); @@ -88,9 +88,9 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const ForceUndirtyMrkPnt(); sal_uIntPtr nAnz=0; if (!ImpIsFrameHandles()) { - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - if (nMarkAnz<=nFrameHandlesLimit) { - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + size_t nMarkAnz=GetMarkedObjectCount(); + if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) { + for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); if (pPts!=NULL) nAnz+=pPts->size(); @@ -124,8 +124,8 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) if (pMark==NULL) { - sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); - if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) + const size_t nMarkNum=TryToFindMarkedObject(pObj); + if (nMarkNum==SAL_MAX_SIZE) return false; pMark=GetSdrMarkByIndex(nMarkNum); } @@ -168,9 +168,9 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) } else { - for (sal_uIntPtr i = aHdl.GetHdlCount(); i>0;) + for (size_t i = aHdl.GetHdlCount(); i>0;) { - i--; + --i; SdrHdl* pPlusHdl=aHdl.GetHdl(i); if (pPlusHdl->IsPlusHdl() && pPlusHdl->GetSourceHdlNum()==nHdlNum) { @@ -193,8 +193,8 @@ bool SdrMarkView::MarkPoint(SdrHdl& rHdl, bool bUnmark) bool bRet=false; const SdrObject* pObj=rHdl.GetObj(); if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) { - sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); - if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { + const size_t nMarkNum=TryToFindMarkedObject(pObj); + if (nMarkNum!=SAL_MAX_SIZE) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); pM->ForceMarkedPoints(); if (ImpMarkPoint(&rHdl,pM,bUnmark)) { @@ -216,16 +216,16 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark) const SdrPageView* pPV0=NULL; SdrMark* pM=NULL; aHdl.Sort(); - sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); - for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) { - nHdlNum--; + const size_t nHdlAnz=aHdl.GetHdlCount(); + for (size_t nHdlNum=nHdlAnz; nHdlNum>0;) { + --nHdlNum; SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) { const SdrObject* pObj=pHdl->GetObj(); const SdrPageView* pPV=pHdl->GetPageView(); if (pObj!=pObj0 || pPV!=pPV0 || pM==NULL) { // This section is for optimization, - sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); // so ImpMarkPoint() doesn't always - if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { // have to search the object in the MarkList. + const size_t nMarkNum=TryToFindMarkedObject(pObj); // so ImpMarkPoint() doesn't always + if (nMarkNum!=SAL_MAX_SIZE) { // have to search the object in the MarkList. pM=GetSdrMarkByIndex(nMarkNum); pObj0=pObj; pPV0=pPV; @@ -284,8 +284,8 @@ void SdrMarkView::ImpSetPointsRects() const { Rectangle aPnts; Rectangle aGlue; - sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); - for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { + const size_t nHdlAnz=aHdl.GetHdlCount(); + for (size_t nHdlNum=0; nHdlNum<nHdlAnz; ++nHdlNum) { const SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); SdrHdlKind eKind=pHdl->GetKind(); if ((eKind==HDL_POLY && pHdl->IsSelected()) || eKind==HDL_GLUE) { @@ -313,8 +313,8 @@ void SdrMarkView::ImpSetPointsRects() const void SdrMarkView::UndirtyMrkPnt() const { bool bChg=false; - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); // PolyPoints @@ -380,8 +380,8 @@ bool SdrMarkView::HasMarkableGluePoints() const bool bRet=false; if (IsGluePointEditMode()) { ForceUndirtyMrkPnt(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -406,8 +406,8 @@ bool SdrMarkView::HasMarkedGluePoints() const { ForceUndirtyMrkPnt(); bool bRet=false; - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); bRet=pPts!=NULL && !pPts->empty(); @@ -421,8 +421,8 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark) ForceUndirtyMrkPnt(); bool bChgd=false; SortMarkedObjects(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + const size_t nMarkAnz=GetMarkedObjectCount(); + for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -479,11 +479,11 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 if (pOut==NULL) pOut=GetFirstOutputDevice(); if (pOut==NULL) return false; SortMarkedObjects(); - sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz; + const size_t nMarkAnz=GetMarkedObjectCount(); + size_t nMarkNum=bBack ? 0 : nMarkAnz; if (bNext) { nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0); - if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return false; + if (nMarkNum==SAL_MAX_SIZE) return false; if (!bBack) nMarkNum++; } while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) { @@ -520,8 +520,8 @@ bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const Sdr ForceUndirtyMrkPnt(); bool bChgd=false; if (pObj!=NULL) { - sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj); - if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) { + const size_t nMarkPos=TryToFindMarkedObject(pObj); + if (nMarkPos!=SAL_MAX_SIZE) { SdrMark* pM=GetSdrMarkByIndex(nMarkPos); SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints(); if (pPts!=NULL) { @@ -550,8 +550,8 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); bool bRet=false; - sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting to NonConst - if (nPos!=CONTAINER_ENTRY_NOTFOUND) { + const size_t nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting to NonConst + if (nPos!=SAL_MAX_SIZE) { const SdrMark* pM=GetSdrMarkByIndex(nPos); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); if (pPts!=NULL) { @@ -564,8 +564,8 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); - sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); - for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { + const size_t nHdlAnz=aHdl.GetHdlCount(); + for (size_t nHdlNum=0; nHdlNum<nHdlAnz; ++nHdlNum) { SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); if (pHdl->GetObj()==pObj && pHdl->GetKind()==HDL_GLUE && diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 9a2e18fc1e2a..4a1e9502f8e7 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -148,10 +148,10 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl { const SdrMarkView& rMarkView = *rDrag.GetView(); const SdrHdlList& rHdlList = rMarkView.GetHdlList(); - const sal_uInt32 nHdlCount = rHdlList.GetHdlCount(); + const size_t nHdlCount = rHdlList.GetHdlCount(); const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : 0); - for(sal_uInt32 a(0); a < nHdlCount; a++) + for(size_t a = 0; a < nHdlCount; ++a) { SdrHdl* pTestHdl = rHdlList.GetHdl(a); @@ -576,11 +576,11 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const { const SdrMarkView& rMarkView = *rDrag.GetView(); const SdrHdlList& rHdlList = rMarkView.GetHdlList(); - const sal_uInt32 nHdlCount = rHdlList.GetHdlCount(); + const size_t nHdlCount = rHdlList.GetHdlCount(); const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : 0); sal_uInt32 nSelectedPoints(0); - for(sal_uInt32 a(0); a < nHdlCount; a++) + for(size_t a = 0; a < nHdlCount; ++a) { SdrHdl* pTestHdl = rHdlList.GetHdl(a); diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 83cac52987a6..122e8a59477c 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -235,7 +235,7 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const // get handles using AddToHdlList from ref object SdrHdlList aLocalList(0); rRefObj.AddToHdlList(aLocalList); - const sal_uInt32 nHdlCount(aLocalList.GetHdlCount()); + const size_t nHdlCount(aLocalList.GetHdlCount()); if(nHdlCount) { @@ -243,7 +243,7 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const // two lists then const Point aOffset(GetOffset()); - for(sal_uInt32 a(0L); a < nHdlCount; a++) + for(size_t a = 0; a < nHdlCount; ++a) { SdrHdl* pCandidate = aLocalList.GetHdl(a); pCandidate->SetPos(pCandidate->GetPos() + aOffset); @@ -254,7 +254,7 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const // source list is deleted while(aLocalList.GetHdlCount()) { - aLocalList.RemoveHdl(aLocalList.GetHdlCount() - 1L); + aLocalList.RemoveHdl(aLocalList.GetHdlCount() - 1); } } } 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(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 9da38fbcac02..430965a5690c 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1298,8 +1298,8 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView) rView.BegUndo(aStr); } - sal_uIntPtr nAnz=rML.GetMarkCount(); - for (sal_uIntPtr nm=0; nm<nAnz; nm++) + const size_t nAnz=rML.GetMarkCount(); + for (size_t nm=0; nm<nAnz; ++nm) { SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj(); SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pObj2); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 9edcaf8186f8..a446cb75b3e7 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -851,10 +851,10 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev); } else { SortMarkedObjects(); - sal_uIntPtr nAnz0=GetMarkedObjectCount(); + const size_t nAnz0=GetMarkedObjectCount(); bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark); SortMarkedObjects(); - sal_uIntPtr nAnz1=GetMarkedObjectCount(); + const size_t nAnz1=GetMarkedObjectCount(); bUnmark=nAnz1<nAnz0; } if (!bUnmark) { @@ -1073,7 +1073,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* // are 3D objects selected? bool b3DObjSelected = false; - for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) { + for (size_t a=0; !b3DObjSelected && a<GetMarkedObjectCount(); ++a) { SdrObject* pObj = GetMarkedObjectByIndex(a); if(pObj && pObj->ISA(E3dObject)) b3DObjSelected = true; @@ -1298,12 +1298,12 @@ SdrViewContext SdrView::GetContext() const if( IsGluePointEditMode() ) return SDRCONTEXT_GLUEPOINTEDIT; - const sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); + const size_t nMarkAnz = GetMarkedObjectCount(); if( HasMarkablePoints() && !IsFrameHandles() ) { bool bPath=true; - for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ ) + for( size_t nMarkNum = 0; nMarkNum < nMarkAnz && bPath; ++nMarkNum ) if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj)) bPath=false; @@ -1315,7 +1315,7 @@ SdrViewContext SdrView::GetContext() const { bool bGraf = true, bMedia = true, bTable = true; - for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ ) + for( size_t nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); ++nMarkNum ) { const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum ); DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" ); diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index e6f179f1c24f..2c3bee7e14e4 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -684,9 +684,8 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ]; const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin(); const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), false ); - sal_uInt32 n, nCount; - for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ ) + for( size_t n = 0, nCount = GetMarkedObjectCount(); n < nCount; ++n ) { SdrMark* pMark = GetSdrMarkByIndex( n ); @@ -697,11 +696,11 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* rObjVector1.push_back( pMark ); } - for( n = 0, nCount = aObjVectors.size(); n < nCount; n++ ) + for( size_t n = 0, nCount = aObjVectors.size(); n < nCount; ++n ) { ::std::vector< SdrMark* >& rObjVector = aObjVectors[ n ]; - for( sal_uInt32 i = 0; i < rObjVector.size(); i++ ) + for( size_t i = 0; i < rObjVector.size(); ++i ) { SdrMark* pMark = rObjVector[ i ]; aRetval.push_back(pMark->GetMarkedSdrObj()); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 57b507c54d6b..9009414e1821 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2225,8 +2225,8 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomCenter(),HDL_LOWER) ); pH->SetMoveOutside( true ); rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomRight(),HDL_LWRGT) ); pH->SetMoveOutside( true ); - sal_uIntPtr nHdlCount = rHdlList.GetHdlCount(); - for( sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ ) + const size_t nHdlCount = rHdlList.GetHdlCount(); + for( size_t nHdl = 0; nHdl < nHdlCount; ++nHdl ) rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this); } @@ -2242,9 +2242,9 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const SdrHdl* pRetval = 0; SdrHdlList aLocalList(0); AddToHdlList(aLocalList); - const sal_uInt32 nHdlCount(aLocalList.GetHdlCount()); + const size_t nHdlCount(aLocalList.GetHdlCount()); - if(nHdlCount && nHdlNum < nHdlCount) + if(nHdlCount && static_cast<size_t>(nHdlNum) < nHdlCount) { // remove and remember. The other created handles will be deleted again with the // destruction of the local list diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index eea2995837f0..9ff2bb2cc502 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -871,7 +871,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) bool bEnableTransparency = true; bool bEnableCrop = ( 1 == rMarkList.GetMarkCount() ); - for( int i = 0, nCount = rMarkList.GetMarkCount(); i < nCount; ++i ) + for( size_t i = 0, nCount = rMarkList.GetMarkCount(); i < nCount; ++i ) { SdrGrafObj* pGrafObj = dynamic_cast< SdrGrafObj* >( rMarkList.GetMark( i )->GetMarkedSdrObj() ); diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 191e91dcb05e..eb37bc6e892f 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -546,9 +546,9 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB if (pSdrView) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); - for(i=0; i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -625,7 +625,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); static const OUString sExtrusion( "Extrusion" ); static const OUString sViewPoint( "ViewPoint" ); @@ -638,7 +638,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) double fFinalSkewAngle = -1; bool bHasCustomShape = false; - for(i=0;i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -776,7 +776,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); static const OUString sExtrusion( "Extrusion" ); static const OUString sProjectionMode( "ProjectionMode" ); @@ -786,7 +786,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) sal_Int32 nFinalProjection = -1; bool bHasCustomShape = false; - for(i=0;i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -832,7 +832,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); static const OUString sExtrusion( "Extrusion" ); static const OUString sShadeMode( "ShadeMode" ); @@ -844,7 +844,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) sal_Int32 nFinalSurface = -1; bool bHasCustomShape = false; - for(i=0;i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -920,7 +920,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); static const OUString sExtrusion( "Extrusion" ); static const OUString sDepth( "Depth" ); @@ -930,7 +930,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) double fFinalDepth = -1; bool bHasCustomShape = false; - for(i=0;i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -1000,7 +1000,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 ) void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); static const OUString sExtrusion( "Extrusion" ); static const OUString sFirstLightDirection( "FirstLightDirection" ); @@ -1016,7 +1016,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) int nFinalDirection = -1; bool bHasCustomShape = false; - for(i=0;i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -1081,7 +1081,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); static const OUString sExtrusion( "Extrusion" ); static const OUString sBrightness( "Brightness" ); @@ -1091,7 +1091,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) int nFinalLevel = -1; bool bHasCustomShape = false; - for(i=0;i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -1149,7 +1149,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); static const OUString sExtrusion( "Extrusion" ); static const OUString sExtrusionColor( "Color" ); @@ -1161,7 +1161,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) Color aFinalColor; bool bHasCustomShape = false; - for(i=0;i<nCount; i++) + for(size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -1224,10 +1224,10 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) static const OUString sExtrusion( "Extrusion" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); bool bFound = false; - for(i=0;(i<nCount) && !bFound ; i++) + for(size_t i=0;(i<nCount) && !bFound ; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 24a1c25b927c..8bf103061ddc 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -51,10 +51,10 @@ using namespace ::com::sun::star::uno; void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); sal_Int32 nAlignment = -1; - for( i = 0; i < nCount; i++ ) + for( size_t i = 0; i < nCount; ++i ) { SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -88,10 +88,10 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); sal_Int32 nCharacterSpacing = -1; - for( i = 0; i < nCount; i++ ) + for( size_t i = 0; i < nCount; ++i ) { SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -113,10 +113,10 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); bool bChecked = false; - for( i = 0; i < nCount; i++ ) + for( size_t i = 0; i < nCount; ++i ) { SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -132,11 +132,11 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); OUString aFontWorkShapeType; - for( i = 0; i < nCount; i++ ) + for( size_t i = 0; i < nCount; ++i ) { SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA( SdrObjCustomShape ) ) @@ -225,9 +225,9 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) static const OUString sTextPath( "TextPath" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; + const size_t nCount = rMarkList.GetMarkCount(); bool bFound = false; - for(i=0;(i<nCount) && !bFound ; i++) + for(size_t i=0; (i<nCount) && !bFound ; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -449,8 +449,8 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi if ( !aCustomShape.isEmpty() ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uInt32 nCount = rMarkList.GetMarkCount(), i; - for( i = 0; i < nCount; i++ ) + const size_t nCount = rMarkList.GetMarkCount(); + for( size_t i = 0; i < nCount; ++i ) { SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) @@ -525,8 +525,8 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - for( i = 0; i < nCount; i++ ) + const size_t nCount = rMarkList.GetMarkCount(); + for( size_t i = 0; i < nCount; ++i ) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); if( pObj->ISA(SdrObjCustomShape) ) diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index faeeebc87847..13a38104a3a6 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -273,7 +273,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() ) { - if(CONTAINER_ENTRY_NOTFOUND != pView->TryToFindMarkedObject(pSdrShape)) + if(SAL_MAX_SIZE != pView->TryToFindMarkedObject(pSdrShape)) { pView->MarkObj(pSdrShape, pView->GetSdrPageView(), true, false); } |