include/svx/svdmrkv.hxx | 1 reportdesign/source/ui/report/ViewsWindow.cxx | 4 +- sd/source/ui/view/sdview2.cxx | 4 +- sd/source/ui/view/sdview3.cxx | 2 - svx/source/engine3d/view3d.cxx | 6 ++-- svx/source/svdraw/svddrgmt.cxx | 8 ++--- svx/source/svdraw/svdedtv.cxx | 6 ++-- svx/source/svdraw/svdedtv1.cxx | 36 +++++++++++++------------- svx/source/svdraw/svdedtv2.cxx | 32 +++++++++++------------ svx/source/svdraw/svdglev.cxx | 8 ++--- svx/source/svdraw/svdmrkv.cxx | 34 ++++++++++++------------ svx/source/svdraw/svdmrkv1.cxx | 26 +++++++++--------- svx/source/svdraw/svdpoev.cxx | 18 ++++++------- svx/source/svdraw/svdxcgv.cxx | 4 +- 14 files changed, 94 insertions(+), 95 deletions(-)
New commits: commit 4c5485ef6826b5b2483df869056aac4499aff229 Author: Xisco Fauli <[email protected]> AuthorDate: Wed May 29 12:37:42 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed May 29 15:50:27 2024 +0200 svx: GetSdrMarkByIndex -> GetMarkedObjectList().GetMark In order to reduce number of calls to GetMarkedObjectList() later on Change-Id: Iec0ad9ed33329719116e39232f86d92dbd6e0da8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168211 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index edcc0678b676..8838005e3d21 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -261,7 +261,6 @@ public: // returns SAL_MAX_SIZE if not found size_t TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } SdrPageView* GetSdrPageViewOfMarkedByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } - SdrMark* GetSdrMarkByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum); } SdrObject* GetMarkedObjectByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetMarkedSdrObj(); } size_t GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 44c3c4285e38..c04a01b2d53e 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -631,7 +631,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles) const size_t nCount = rView.GetMarkedObjectCount(); for (size_t i=0; i < nCount; ++i) { - const SdrMark* pM = rView.GetSdrMarkByIndex(i); + const SdrMark* pM = rView.GetMarkedObjectList().GetMark(i); SdrObject* pObj = pM->GetMarkedSdrObj(); tools::Rectangle aObjRect(pObj->GetSnapRect()); _rSortRectangles.emplace(aObjRect,TRectangleMap::mapped_type(pObj,&rView)); @@ -1027,7 +1027,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi const size_t nCount = rView.GetMarkedObjectCount(); for (size_t i=0; i < nCount; ++i) { - const SdrMark* pM = rView.GetSdrMarkByIndex(i); + const SdrMark* pM = rView.GetMarkedObjectList().GetMark(i); SdrObject* pObj = pM->GetMarkedSdrObj(); if (::std::find(m_aBegDragTempList.begin(),m_aBegDragTempList.end(),pObj) == m_aBegDragTempList.end()) { diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9703c7c3f022..2ce09acf8b32 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -453,7 +453,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if (GetMarkedObjectCount() == 1) { - SdrMark* pMark = GetSdrMarkByIndex(0); + SdrMark* pMark = GetMarkedObjectList().GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); aRect.Union( pObj->GetLogicRect() ); } @@ -634,7 +634,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, if( GetMarkedObjectCount() == 1 ) { - SdrMark* pMark = GetSdrMarkByIndex(0); + SdrMark* pMark = GetMarkedObjectList().GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); aRect.Union( pObj->GetLogicRect() ); } diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index a40edc2baed1..6df4d8161548 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -405,7 +405,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, for( size_t nM = 0; nM < GetMarkedObjectCount(); ++nM ) { - SdrMark* pM = GetSdrMarkByIndex( nM ); + SdrMark* pM = GetMarkedObjectList().GetMark( nM ); SdrObject* pO = pM->GetMarkedSdrObj(); if( pO ) diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 6b0923d96015..eb4a6e758e2f 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -821,7 +821,7 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, const basegfx::B2DPoint& rPnt1 else BegUndo(SvxResId(RID_SVX_3D_UNDO_LATHE)); - SdrModel& rSdrModel(GetSdrMarkByIndex(0)->GetMarkedSdrObj()->getSdrModelFromSdrObject()); + SdrModel& rSdrModel(GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj()->getSdrModelFromSdrObject()); // Create a new scene for the created 3D object rtl::Reference<E3dScene> pScene = new E3dScene(rSdrModel); @@ -879,7 +879,7 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, const basegfx::B2DPoint& rPnt1 // SnapRect extension enables mirroring in the axis of rotation for(size_t a=0; a<GetMarkedObjectCount(); ++a) { - SdrMark* pMark = GetSdrMarkByIndex(a); + SdrMark* pMark = GetMarkedObjectList().GetMark(a); SdrObject* pObj = pMark->GetMarkedSdrObj(); tools::Rectangle aTurnRect = pObj->GetSnapRect(); basegfx::B2DPoint aRot; @@ -919,7 +919,7 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, const basegfx::B2DPoint& rPnt1 // Conversion to SdrPathObject, also fonts for(size_t a=0; a<GetMarkedObjectCount(); ++a) { - SdrMark* pMark = GetSdrMarkByIndex(a); + SdrMark* pMark = GetMarkedObjectList().GetMark(a); SdrObject* pObj = pMark->GetMarkedSdrObj(); ImpCreate3DObject(pScene.get(), pObj, bExtrude, fDepth, aLatheMat); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index b927f5ebb255..dec7c55a4147 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -369,7 +369,7 @@ void SdrDragMethod::createSdrDragEntries_SolidDrag() for(size_t a = 0; a < nMarkCount; ++a) { - SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(a); + SdrMark* pM = getSdrDragView().GetMarkedObjectList().GetMark(a); if(pM->GetPageView() == pPV) { @@ -427,7 +427,7 @@ void SdrDragMethod::createSdrDragEntries_PolygonDrag() for(size_t a = 0; !bNoPolygons && a < nMarkCount; ++a) { - SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(a); + SdrMark* pM = getSdrDragView().GetMarkedObjectList().GetMark(a); if(pM->GetPageView() == getSdrDragView().GetSdrPageView()) { @@ -472,7 +472,7 @@ void SdrDragMethod::createSdrDragEntries_PointDrag() for(size_t nm = 0; nm < nMarkCount; ++nm) { - SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(nm); + SdrMark* pM = getSdrDragView().GetMarkedObjectList().GetMark(nm); if(pM->GetPageView() == getSdrDragView().GetSdrPageView()) { @@ -517,7 +517,7 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag() for(size_t nm = 0; nm < nMarkCount; ++nm) { - SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(nm); + SdrMark* pM = getSdrDragView().GetMarkedObjectList().GetMark(nm); if(pM->GetPageView() == getSdrDragView().GetSdrPageView()) { diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 3128a68cbb9e..0a0cd49ddea3 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -534,7 +534,7 @@ void SdrEditView::CheckPossibilities() if(m_bGradientAllowed) { // gradient depends on fill style - const SdrMark* pM = GetSdrMarkByIndex(0); + const SdrMark* pM = GetMarkedObjectList().GetMark(0); const SdrObject* pObj = pM->GetMarkedSdrObj(); // may be group object, so get merged ItemSet @@ -557,7 +557,7 @@ void SdrEditView::CheckPossibilities() const SdrPageView* pPV0=nullptr; for (size_t nm=0; nm<nMarkCount; ++nm) { - const SdrMark* pM=GetSdrMarkByIndex(nm); + const SdrMark* pM=GetMarkedObjectList().GetMark(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrPageView* pPV=pM->GetPageView(); if (pPV!=pPV0) { @@ -687,7 +687,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage() { bool bFlg=false; for (size_t nm=0; nm<GetMarkedObjectCount(); ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); tools::Rectangle aObjRect(pObj->GetCurrentBoundRect()); tools::Rectangle aPgRect(pM->GetPageView()->GetPageRect()); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 13e0cd53f9da..19a46dd2e173 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -100,7 +100,7 @@ void SdrEditView::SetMarkedObjRect(const tools::Rectangle& rRect) for (size_t nm=0; nm<nCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); if (bUndo) AddUndo(GetModel().GetSdrUndoFactory().CreateUndoGeoObject(*pO)); @@ -199,7 +199,7 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy) const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); if( bUndo ) { @@ -231,7 +231,7 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); if( bUndo ) { @@ -260,7 +260,7 @@ void SdrEditView::ResizeMultMarkedObj(const Point& rRef, const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); if( bUndo ) { @@ -286,7 +286,7 @@ Degree100 SdrEditView::GetMarkedObjRotate() const if(GetMarkedObjectCount()) { - SdrMark* pM = GetSdrMarkByIndex(0); + SdrMark* pM = GetMarkedObjectList().GetMark(0); SdrObject* pO = pM->GetMarkedSdrObj(); nRetval = pO->GetRotateAngle(); @@ -319,7 +319,7 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, Degree100 nAngle, bool bCop for(size_t nm = 0; nm < nMarkCount; ++nm) { - SdrMark* pM = GetSdrMarkByIndex(nm); + SdrMark* pM = GetMarkedObjectList().GetMark(nm); SdrObject* pO = pM->GetMarkedSdrObj(); if( bUndo ) @@ -383,7 +383,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b for(size_t nm = 0; nm < nMarkCount; ++nm) { - SdrMark* pM = GetSdrMarkByIndex(nm); + SdrMark* pM = GetMarkedObjectList().GetMark(nm); SdrObject* pO = pM->GetMarkedSdrObj(); if( bUndo ) @@ -438,7 +438,7 @@ Degree100 SdrEditView::GetMarkedObjShear() const Degree100 nAngle(0); const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount && bOk; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); Degree100 nAngle2=pO->GetShearAngle(); if (b1st) nAngle=nAngle2; @@ -471,7 +471,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, Degree100 nAngle, bool bVShe const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); if( bUndo ) { @@ -586,7 +586,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); if (bUndo) AddUndo(GetModel().GetSdrUndoFactory().CreateUndoGeoObject(*pO)); @@ -660,7 +660,7 @@ void SdrEditView::DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon& const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); if (bUndo) AddUndo(GetModel().GetSdrUndoFactory().CreateUndoGeoObject(*pO)); @@ -771,7 +771,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr) const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - const SdrMark* pM=GetSdrMarkByIndex(nm); + const SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); if (bUndo) AddUndo(GetModel().GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); @@ -807,7 +807,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr) const tools::Rectangle aLogicRect; const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - const SdrMark* pM=GetSdrMarkByIndex(nm); + const SdrMark* pM=GetMarkedObjectList().GetMark(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (nm==0) { nLayerId=pObj->GetLayer(); @@ -1153,7 +1153,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); if( bUndo ) @@ -1282,7 +1282,7 @@ SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const bool b1st=true; const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet(); if (b1st) pRet=pSS; else if (pRet!=pSS) return nullptr; // different stylesheets @@ -1312,7 +1312,7 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRe const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); if( bUndo ) { AddUndo(GetModel().GetSdrUndoFactory().CreateUndoGeoObject(*pM->GetMarkedSdrObj())); @@ -1926,7 +1926,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert) bool bHasFixed=false; for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); @@ -1969,7 +1969,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert) Point aCenter(aBound.Center()); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 7a288ae86ded..f88f30ec30b2 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -91,7 +91,7 @@ void SdrEditView::MovMarkedToTop() for (size_t nm=nCount; nm>0;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject(); if (pOL!=pOL0) @@ -179,7 +179,7 @@ void SdrEditView::MovMarkedToBtm() size_t nNewPos=0; for (size_t nm=0; nm<nCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject(); if (pOL!=pOL0) @@ -273,7 +273,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) SdrMark aRefMark; if (nRefMark!=SAL_MAX_SIZE) { - aRefMark=*GetSdrMarkByIndex(nRefMark); + aRefMark=*GetMarkedObjectList().GetMark(nRefMark); GetMarkedObjectListWriteAccess().DeleteMark(nRefMark); } PutMarkedToBtm(); @@ -293,7 +293,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) for (size_t nm=nCount; nm>0;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj!=pRefObj) { @@ -374,7 +374,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) SdrMark aRefMark; if (nRefMark!=SAL_MAX_SIZE) { - aRefMark=*GetSdrMarkByIndex(nRefMark); + aRefMark=*GetMarkedObjectList().GetMark(nRefMark); GetMarkedObjectListWriteAccess().DeleteMark(nRefMark); } PutMarkedToTop(); @@ -391,7 +391,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) SdrObjList* pOL0=nullptr; size_t nNewPos=0; for (size_t nm=0; nm<nCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj!=pRefObj) { SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject(); @@ -808,7 +808,7 @@ void SdrEditView::DistributeMarkedObjects(sal_uInt16 SlotID) for( size_t a = 0; a < nMark; ++a ) { - SdrMark* pMark = GetSdrMarkByIndex(a); + SdrMark* pMark = GetMarkedObjectList().GetMark(a); ImpDistributeEntry aNew; aNew.mpObj = pMark->GetMarkedSdrObj(); @@ -899,7 +899,7 @@ void SdrEditView::DistributeMarkedObjects(sal_uInt16 SlotID) for( size_t a = 0; a < nMark; ++a ) { - SdrMark* pMark = GetSdrMarkByIndex(a); + SdrMark* pMark = GetMarkedObjectList().GetMark(a); ImpDistributeEntry aNew; aNew.mpObj = pMark->GetMarkedSdrObj(); @@ -1023,7 +1023,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) for(size_t a=0; a<GetMarkedObjectCount(); ++a) { - SdrMark* pM = GetSdrMarkByIndex(a); + SdrMark* pM = GetMarkedObjectList().GetMark(a); SdrObject* pObj = pM->GetMarkedSdrObj(); if(ImpCanConvertForCombine(pObj)) @@ -1336,7 +1336,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) for(size_t a = GetMarkedObjectCount(); a; ) { --a; - SdrMark* pM = GetSdrMarkByIndex(a); + SdrMark* pM = GetMarkedObjectList().GetMark(a); SdrObject* pObj = pM->GetMarkedSdrObj(); SdrObjList* pThisOL = pObj->getParentSdrObjListFromSdrObject(); @@ -1739,7 +1739,7 @@ void SdrEditView::DismantleMarkedObjects(bool bMakeLines) GetModel().setLock(true); for (size_t nm=GetMarkedObjectCount(); nm>0;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject(); @@ -1795,7 +1795,7 @@ void SdrEditView::GroupMarked() { // add UndoActions for all affected objects --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); AddUndoActions( CreateConnectorUndo( *pObj ) ); AddUndo(GetModel().GetSdrUndoFactory().CreateUndoRemoveObject( *pObj )); @@ -1822,7 +1822,7 @@ void SdrEditView::GroupMarked() for (size_t nm=GetMarkedObjectCount(); nm>0;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); if (pM->GetPageView()==pPV) { SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -1894,7 +1894,7 @@ void SdrEditView::UnGroupMarked() bool bNameOk=false; for (size_t nm=GetMarkedObjectCount(); nm>0;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pGrp=pM->GetMarkedSdrObj(); SdrObjList* pSrcLst=pGrp->GetSubList(); if (pSrcLst!=nullptr) { @@ -2059,7 +2059,7 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea) } for (size_t nm=nMarkCount; nm>0;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); if (pObj->IsGroupObject() && !pObj->Is3DObj()) { @@ -2129,7 +2129,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) } --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject(); diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 5a67e3685f85..1904af079748 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -43,7 +43,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co { const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont& rPts = pM->GetMarkedGluePoints(); if (!rPts.empty()) @@ -231,7 +231,7 @@ void SdrGlueEditView::DeleteMarkedGluePoints() const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont& rPts = pM->GetMarkedGluePoints(); if (!rPts.empty()) @@ -273,7 +273,7 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrUShortCont& rPts = pM->GetMarkedGluePoints(); SdrGluePointList* pGPL=pObj->ForceGluePointList(); @@ -313,7 +313,7 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo { const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont& rPts = pM->GetMarkedGluePoints(); if (!rPts.empty()) { diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 29885cf1aa1e..5aa16c456d08 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -622,7 +622,7 @@ bool SdrMarkView::ImpIsFrameHandles() const if (meDragMode==SdrDragMode::Rotate) { // when rotating, use ObjOwn drag, if there's at least 1 PolyObj for (size_t nMarkNum=0; nMarkNum<nMarkCount && bFrmHdl; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->IsPolyObj(); } @@ -631,7 +631,7 @@ bool SdrMarkView::ImpIsFrameHandles() const if (!bFrmHdl) { // FrameHandles, if at least 1 Obj can't do SpecialDrag for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bFrmHdl; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->hasSpecialDrag(); } @@ -904,7 +904,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const S if (GetMarkedObjectCount()) { - SdrMark* pM = GetSdrMarkByIndex(0); + SdrMark* pM = GetMarkedObjectList().GetMark(0); SdrObject* pO = pM->GetMarkedSdrObj(); Degree100 nRotAngle = pO->GetRotateAngle(); // true if we are dealing with a RotGrfFlyFrame @@ -1299,7 +1299,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) for (size_t nMarkNum=0; nMarkNum<nMarkCount && (mpMarkedPV!=nullptr || !bFrmHdl); ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); if (mpMarkedPV!=pM->GetPageView()) { @@ -1465,7 +1465,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) { for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); const size_t nSiz0=maHdlList.GetHdlCount(); @@ -1507,7 +1507,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) // GluePoint handles for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (!pGPL) @@ -1907,7 +1907,7 @@ void SdrMarkView::CheckMarked() { for (size_t nm=GetMarkedObjectCount(); nm>0;) { --nm; - SdrMark* pM = GetSdrMarkByIndex(nm); + SdrMark* pM = GetMarkedObjectList().GetMark(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); SdrPageView* pPV = pM->GetPageView(); bool bRaus = !pObj || !pPV->IsObjMarkable(pObj); @@ -1991,7 +1991,7 @@ bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const bool bRet=false; nTol=ImpGetHitTolLogic(nTol,nullptr); for (size_t nm=0; nm<GetMarkedObjectCount() && !bRet; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); bRet = nullptr != CheckSingleSdrObjectHit(rPnt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),SdrSearchOptions::NONE,nullptr); } return bRet; @@ -2034,7 +2034,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev) size_t nSearchObjNum = bPrev ? 0 : SAL_MAX_SIZE; if (nMarkCount!=0) { nChgMarkNum=bPrev ? 0 : nMarkCount-1; - SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nChgMarkNum); assert(pM != nullptr); if (pM->GetMarkedSdrObj() != nullptr) nSearchObjNum = pM->GetMarkedSdrObj()->GetNavigationPosition(); @@ -2086,7 +2086,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=nMarkCount; nm>0 && pTopMarkHit==nullptr;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); if(CheckSingleSdrObjectHit(rPnt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),SdrSearchOptions::NONE,nullptr)) { pTopMarkHit=pM; @@ -2102,7 +2102,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) // find lowermost of the selected objects that is hit by rPnt // and is placed on the same PageView as pTopMarkHit for (size_t nm=0; nm<nMarkCount && pBtmMarkHit==nullptr; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrPageView* pPV2=pM->GetPageView(); if (pPV2==pPV && CheckSingleSdrObjectHit(rPnt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,SdrSearchOptions::NONE,nullptr)) { @@ -2512,7 +2512,7 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP size_t nMrkNum=nMrkCnt; while (pHitObj==nullptr && nMrkNum>0) { nMrkNum--; - SdrMark* pM=GetSdrMarkByIndex(nMrkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nMrkNum); pObj=pM->GetMarkedSdrObj(); pPV=pM->GetPageView(); pHitObj=CheckSingleSdrObjectHit(rPnt,nTol,pObj,pPV,nOptions,nullptr); @@ -2598,7 +2598,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nMarkNum=nMarkCount; nMarkNum>0;) { --nMarkNum; - SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); SdrPageView* pPV=pM->GetPageView(); SdrObject* pObj=pM->GetMarkedSdrObj(); if (CheckSingleSdrObjectHit(rPnt,mnHitTolLog,pObj,pPV,SdrSearchOptions::TESTMARKABLE,nullptr)) { @@ -2610,7 +2610,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie if (bBoundCheckOn2ndPass) { for (size_t nMarkNum=nMarkCount; nMarkNum>0;) { --nMarkNum; - SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); SdrPageView* pPV=pM->GetPageView(); SdrObject* pObj=pM->GetMarkedSdrObj(); tools::Rectangle aRect(pObj->GetCurrentBoundRect()); @@ -2688,7 +2688,7 @@ tools::Rectangle SdrMarkView::GetMarkedObjBoundRect() const { tools::Rectangle aRect; for (size_t nm=0; nm<GetMarkedObjectCount(); ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); tools::Rectangle aR1(pO->GetCurrentBoundRect()); if (aRect.IsEmpty()) aRect=aR1; @@ -2704,7 +2704,7 @@ const tools::Rectangle& SdrMarkView::GetMarkedObjRect() const const_cast<SdrMarkView*>(this)->mbMarkedObjRectDirty=false; tools::Rectangle aRect; for (size_t nm=0; nm<GetMarkedObjectCount(); ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pO = pM->GetMarkedSdrObj(); if (!pO) continue; @@ -2757,7 +2757,7 @@ void SdrMarkView::EnterMarkedGroup() for (size_t nm = GetMarkedObjectCount(); nm > 0 && !bEnter;) { --nm; - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); if (pM->GetPageView()==pPV) { SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsGroupObject()) { diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index f8e039468231..62d0e0f0ba4e 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -34,7 +34,7 @@ bool SdrMarkView::HasMarkablePoints() const const size_t nMarkCount=GetMarkedObjectCount(); if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) { for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bRet=pObj->IsPolyObj(); } @@ -51,7 +51,7 @@ sal_Int32 SdrMarkView::GetMarkablePointCount() const const size_t nMarkCount=GetMarkedObjectCount(); if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) { for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsPolyObj()) { nCount+=pObj->GetPointCount(); @@ -70,7 +70,7 @@ bool SdrMarkView::HasMarkedPoints() const const size_t nMarkCount=GetMarkedObjectCount(); if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) { for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrUShortCont& rPts = pM->GetMarkedPoints(); bRet = !rPts.empty(); } @@ -106,7 +106,7 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) const size_t nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum==SAL_MAX_SIZE) return false; - pMark=GetSdrMarkByIndex(nMarkNum); + pMark=GetMarkedObjectList().GetMark(nMarkNum); } const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum()); SdrUShortCont& rPts=pMark->GetMarkedPoints(); @@ -172,7 +172,7 @@ bool SdrMarkView::MarkPoint(SdrHdl& rHdl, bool bUnmark) if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) { const size_t nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum!=SAL_MAX_SIZE) { - SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); if (ImpMarkPoint(&rHdl,pM,bUnmark)) { MarkListHasChanged(); bRet=true; @@ -202,7 +202,7 @@ bool SdrMarkView::MarkPoints(const tools::Rectangle* pRect, bool bUnmark) if (pObj!=pObj0 || pPV!=pPV0 || pM==nullptr) { // This section is for optimization, 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); + pM=GetMarkedObjectList().GetMark(nMarkNum); pObj0=pObj; pPV0=pPV; } else { @@ -290,7 +290,7 @@ void SdrMarkView::UndirtyMrkPnt() const bool bChg=false; const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { - SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); // PolyPoints { @@ -357,7 +357,7 @@ bool SdrMarkView::HasMarkableGluePoints() const ForceUndirtyMrkPnt(); const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -383,7 +383,7 @@ bool SdrMarkView::HasMarkedGluePoints() const bool bRet=false; const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrUShortCont& rPts = pM->GetMarkedGluePoints(); bRet = !rPts.empty(); } @@ -398,7 +398,7 @@ bool SdrMarkView::MarkGluePoints(const tools::Rectangle* pRect, bool bUnmark) SortMarkedObjects(); const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { - SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); SdrUShortCont& rPts = pM->GetMarkedGluePoints(); @@ -452,7 +452,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 size_t nMarkNum=nMarkCount; while (nMarkNum>0) { nMarkNum--; - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + const SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -484,7 +484,7 @@ bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, bool bUnm if (pObj!=nullptr) { const size_t nMarkPos=TryToFindMarkedObject(pObj); if (nMarkPos!=SAL_MAX_SIZE) { - SdrMark* pM=GetSdrMarkByIndex(nMarkPos); + SdrMark* pM=GetMarkedObjectList().GetMark(nMarkPos); SdrUShortCont& rPts = pM->GetMarkedGluePoints(); bool bContains = rPts.find( nId ) != rPts.end(); if (!bUnmark && !bContains) { @@ -512,7 +512,7 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const bool bRet=false; const size_t nPos=TryToFindMarkedObject(pObj); // casting to NonConst if (nPos!=SAL_MAX_SIZE) { - const SdrMark* pM=GetSdrMarkByIndex(nPos); + const SdrMark* pM=GetMarkedObjectList().GetMark(nPos); const SdrUShortCont& rPts = pM->GetMarkedGluePoints(); bRet = rPts.find( nId ) != rPts.end(); } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 8cd55cdbd019..ea71bbb06b67 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -74,7 +74,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities() for(size_t nMarkNum = 0; nMarkNum < nMarkCount; ++nMarkNum) { - SdrMark* pM = GetSdrMarkByIndex(nMarkNum); + SdrMark* pM = GetMarkedObjectList().GetMark(nMarkNum); CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth ); } } @@ -202,7 +202,7 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) for(size_t nMarkNum(nMarkCount); nMarkNum > 0;) { --nMarkNum; - SdrMark* pM = GetSdrMarkByIndex(nMarkNum); + SdrMark* pM = GetMarkedObjectList().GetMark(nMarkNum); SdrPathObj* pPath = dynamic_cast< SdrPathObj* >( pM->GetMarkedSdrObj() ); if (!pPath) continue; @@ -236,7 +236,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) for(size_t nMarkNum=nMarkCount; nMarkNum > 0;) { --nMarkNum; - SdrMark* pM = GetSdrMarkByIndex(nMarkNum); + SdrMark* pM = GetMarkedObjectList().GetMark(nMarkNum); SdrPathObj* pPath = dynamic_cast< SdrPathObj* >( pM->GetMarkedSdrObj() ); if (!pPath) continue; @@ -302,7 +302,7 @@ void SdrPolyEditView::DeleteMarkedPoints() for (size_t nMarkNum=nMarkCount; nMarkNum>0;) { --nMarkNum; - SdrMark* pM=GetSdrMarkByIndex(nMarkNum); + SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); SdrPathObj* pPath = dynamic_cast< SdrPathObj* >( pM->GetMarkedSdrObj() ); if (!pPath) continue; @@ -347,7 +347,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints() for(size_t nMarkNum = nMarkCount; nMarkNum > 0;) { --nMarkNum; - SdrMark* pM = GetSdrMarkByIndex(nMarkNum); + SdrMark* pM = GetMarkedObjectList().GetMark(nMarkNum); SdrPathObj* pObj = dynamic_cast<SdrPathObj*>( pM->GetMarkedSdrObj() ); if (!pObj) continue; @@ -414,7 +414,7 @@ bool SdrPolyEditView::IsRipUpAtMarkedPointsPossible() const for(size_t a = 0; a < nMarkCount; ++a) { - const SdrMark* pMark = GetSdrMarkByIndex(a); + const SdrMark* pMark = GetMarkedObjectList().GetMark(a); const SdrPathObj* pMarkedPathObject = dynamic_cast< const SdrPathObj* >(pMark->GetMarkedSdrObj()); if (!pMarkedPathObject) @@ -454,7 +454,7 @@ bool SdrPolyEditView::IsOpenCloseMarkedObjectsPossible() const for(size_t a = 0; a < nMarkCount; ++a) { - const SdrMark* pMark = GetSdrMarkByIndex(a); + const SdrMark* pMark = GetMarkedObjectList().GetMark(a); const SdrPathObj* pMarkedPathObject = dynamic_cast< const SdrPathObj* >(pMark->GetMarkedSdrObj()); if(pMarkedPathObject) @@ -485,7 +485,7 @@ SdrObjClosedKind SdrPolyEditView::GetMarkedObjectsClosedState() const for(size_t a = 0; !(bOpen && bClosed) && a < nMarkCount; ++a) { - const SdrMark* pMark = GetSdrMarkByIndex(a); + const SdrMark* pMark = GetMarkedObjectList().GetMark(a); const SdrPathObj* pMarkedPathObject = dynamic_cast< const SdrPathObj* >(pMark->GetMarkedSdrObj()); if(pMarkedPathObject) @@ -522,7 +522,7 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { - SdrMark* pM=GetSdrMarkByIndex(nm); + SdrMark* pM=GetMarkedObjectList().GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPathObj* pPath=dynamic_cast<SdrPathObj*>( pObj ); if (!pPath) diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 573822b48f21..4d5b6fa476df 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -584,7 +584,7 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const if( AreObjectsMarked() ) { - if( ( 1 == GetMarkedObjectCount() ) && GetSdrMarkByIndex( 0 ) ) + if( ( 1 == GetMarkedObjectCount() ) && GetMarkedObjectList().GetMark( 0 ) ) aRet = SdrExchangeView::GetObjGraphic(*GetMarkedObjectByIndex(0)); else aRet = GetMarkedObjMetaFile(); @@ -688,7 +688,7 @@ Graphic SdrExchangeView::GetObjGraphic(const SdrObject& rSdrObject, bool bSVG) for( size_t n = 0, nCount = GetMarkedObjectCount(); n < nCount; ++n ) { - SdrMark* pMark = GetSdrMarkByIndex( n ); + SdrMark* pMark = GetMarkedObjectList().GetMark( n ); // paint objects on control layer on top of all other objects if( nControlLayerId == pMark->GetMarkedSdrObj()->GetLayer() )
