include/svx/svdmrkv.hxx | 2 - reportdesign/source/ui/report/ViewsWindow.cxx | 2 - sc/source/ui/drawfunc/graphsh.cxx | 6 +-- sd/source/ui/func/fucopy.cxx | 2 - sd/source/ui/func/fumorph.cxx | 2 - sd/source/ui/func/futransf.cxx | 2 - sd/source/ui/func/fuvect.cxx | 2 - sd/source/ui/view/GraphicObjectBar.cxx | 2 - sd/source/ui/view/drawview.cxx | 2 - sd/source/ui/view/drviews2.cxx | 2 - sd/source/ui/view/drviews6.cxx | 2 - sd/source/ui/view/drviews9.cxx | 2 - sd/source/ui/view/sdview2.cxx | 2 - sd/source/ui/view/sdview3.cxx | 2 - svx/source/core/extedit.cxx | 2 - svx/source/engine3d/view3d.cxx | 2 - svx/source/svdraw/svdedtv.cxx | 6 +-- svx/source/svdraw/svdedtv1.cxx | 8 ++-- svx/source/svdraw/svdedtv2.cxx | 44 +++++++++++++------------- svx/source/svdraw/svdmrkv.cxx | 14 ++++---- svx/source/svdraw/svdmrkv1.cxx | 10 ++--- svx/source/svdraw/svdpoev.cxx | 8 ++-- svx/source/svdraw/svdview.cxx | 4 +- svx/source/svdraw/svdxcgv.cxx | 4 +- svx/source/tbxctrls/grafctrl.cxx | 2 - sw/source/core/draw/dview.cxx | 2 - 26 files changed, 68 insertions(+), 70 deletions(-)
New commits: commit da95e7ae392368ca414be5c62a08879221cb71e9 Author: Xisco Fauli <[email protected]> AuthorDate: Wed May 29 13:09:02 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed May 29 17:07:38 2024 +0200 SortMarkedObjects() -> GetMarkedObjectList().ForceSort() In order to reduce number of calls to GetMarkedObjectList() later on Change-Id: Ia74949a47308f95607881a7d44c8c26404902745 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168217 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Xisco Fauli <[email protected]> diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 92c788b1a828..51620a78c6b8 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -261,7 +261,6 @@ public: // returns SAL_MAX_SIZE if not found SdrPageView* GetSdrPageViewOfMarkedByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } SdrObject* GetMarkedObjectByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetMarkedSdrObj(); } - void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } bool AreObjectsMarked() const { return 0 != GetMarkedObjectList().GetMarkCount(); } // Get a list of all those links which are connected to marked nodes, diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index d5e7d7b8c930..7c79896e82e0 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -627,7 +627,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles) OSectionView& rView = rxSection->getReportSection().getSectionView(); if ( rView.AreObjectsMarked() ) { - rView.SortMarkedObjects(); + rView.GetMarkedObjectList().ForceSort(); const size_t nCount = rView.GetMarkedObjectList().GetMarkCount(); for (size_t i=0; i < nCount; ++i) { diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 02cdd653fc5f..79401ef28aea 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -401,7 +401,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if( !pPV->IsLayerLocked( aLayer ) ) { pOwnData->SetInternalMove( true ); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); for( size_t nM = 0; nM < GetMarkedObjectList().GetMarkCount(); ++nM ) { diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 384cf5f2d550..8dff357af689 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -276,7 +276,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const if(nullptr != pScene) { // code from parent - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); pScene->SetDrawOnlySelected(true); pScene->SingleObjectPainter(rOut); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 581b9216531b..c6d058b4a644 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -491,7 +491,7 @@ void SdrEditView::CheckPossibilities() return; ImpResetPossibilityFlags(); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nMarkCount = GetMarkedObjectList().GetMarkCount(); if (nMarkCount != 0) { @@ -904,7 +904,7 @@ void SdrEditView::DeleteMarkedObj() void SdrEditView::CopyMarkedObj() { - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList()); // The following loop is used instead of MarkList::Merge(), to be diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 2e349d273d44..93762f675f73 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1869,7 +1869,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert) if (eHor==SdrHorAlign::NONE && eVert==SdrVertAlign::NONE) return; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); if (!GetMarkedObjectList().GetMarkCount()) return; diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 449e1b5535ae..0dd553ad3518 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -80,7 +80,7 @@ void SdrEditView::MovMarkedToTop() if( bUndo ) BegUndo(SvxResId(STR_EditMovToTop),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::MoveToTop); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); for (size_t nm=0; nm<nCount; ++nm) { // All Ordnums have to be correct! GetMarkedObjectByIndex(nm)->GetOrdNum(); @@ -168,7 +168,7 @@ void SdrEditView::MovMarkedToBtm() if( bUndo ) BegUndo(SvxResId(STR_EditMovToBtm),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::MoveToBottom); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); for (size_t nm=0; nm<nCount; ++nm) { // All Ordnums have to be correct! GetMarkedObjectByIndex(nm)->GetOrdNum(); @@ -263,7 +263,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) if( bUndo ) BegUndo(SvxResId(STR_EditPutToTop),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::PutToTop); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); if (pRefObj!=nullptr) { @@ -280,7 +280,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) if (nRefMark!=SAL_MAX_SIZE) { GetMarkedObjectListWriteAccess().InsertEntry(aRefMark); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); } } for (size_t nm=0; nm<nCount; ++nm) @@ -365,7 +365,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) if( bUndo ) BegUndo(SvxResId(STR_EditPutToBtm),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::PutToBottom); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); if (pRefObj!=nullptr) { // Make "behind the object" work, even if the @@ -381,7 +381,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) if (nRefMark!=SAL_MAX_SIZE) { GetMarkedObjectListWriteAccess().InsertEntry(aRefMark); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); } } for (size_t nm=0; nm<nCount; ++nm) { // All Ordnums have to be correct! @@ -436,7 +436,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) void SdrEditView::ReverseOrderOfMarked() { - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nMarkCount=GetMarkedObjectList().GetMarkCount(); if (nMarkCount<=0) return; @@ -997,7 +997,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) return; SdrMarkList aRemove; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const bool bUndo = IsUndoEnabled(); @@ -1327,7 +1327,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) SdrObjList* pCurrentOL = nullptr; SdrMarkList aRemoveBuffer; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); size_t nInsPos = SAL_MAX_SIZE; SdrObjList* pInsOL = nullptr; SdrPageView* pInsPV = nullptr; @@ -1724,7 +1724,7 @@ void SdrEditView::DismantleMarkedObjects(bool bMakeLines) // temporary MarkList SdrMarkList aRemoveBuffer; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const bool bUndo = IsUndoEnabled(); @@ -1784,7 +1784,7 @@ void SdrEditView::GroupMarked() if (!AreObjectsMarked()) return; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -2114,7 +2114,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) if( bUndo ) BegUndo(u""_ustr, u""_ustr, SdrRepeatFunc::ImportMtf); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); SdrMarkList aForTheDescription; SdrMarkList aNewMarked; for (size_t nm =GetMarkedObjectList().GetMarkCount(); nm > 0; ) @@ -2228,7 +2228,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) GetMarkedObjectListWriteAccess().InsertEntry(*aNewMarked.GetMark(a)); } - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); } if (bUndo) diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index bc18b67694fe..3995d2e616d0 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -224,7 +224,7 @@ void SdrMarkView::ModelHasChanged() // In another View 2, the ObjOrder is changed (e. g. MovToTop()) // Then we need to re-sort MarkList. GetMarkedObjectListWriteAccess().SetUnsorted(); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); mbMrkPntDirty=true; UndirtyMrkPnt(); SdrView* pV=static_cast<SdrView*>(this); @@ -2028,7 +2028,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev) return false; } - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nMarkCount=GetMarkedObjectList().GetMarkCount(); size_t nChgMarkNum = SAL_MAX_SIZE; // number of the MarkEntry we want to replace size_t nSearchObjNum = bPrev ? 0 : SAL_MAX_SIZE; @@ -2076,7 +2076,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev) bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) { - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); nTol=ImpGetHitTolLogic(nTol,nullptr); SdrMark* pTopMarkHit=nullptr; SdrMark* pBtmMarkHit=nullptr; @@ -2216,7 +2216,7 @@ void SdrMarkView::MarkObj(const tools::Rectangle& rRect, bool bUnmark) } } if (bFnd) { - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); MarkListHasChanged(); AdjustMarkHdl(); } @@ -2488,7 +2488,7 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect) const { // TODO: lacks a Pass2,Pass3 - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); if (ppRootObj!=nullptr) *ppRootObj=nullptr; if (pbHitPassDirect!=nullptr) *pbHitPassDirect=true; SdrObject* pRet = nullptr; @@ -2591,7 +2591,7 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const { - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const bool bBoundCheckOn2ndPass(nOptions & SdrSearchOptions::PASS2BOUND); rpObj=nullptr; rpPV=nullptr; diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 03c239ac2a54..dd628afc16ad 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -187,7 +187,7 @@ bool SdrMarkView::MarkPoints(const tools::Rectangle* pRect, bool bUnmark) { ForceUndirtyMrkPnt(); bool bChgd=false; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const SdrObject* pObj0=nullptr; const SdrPageView* pPV0=nullptr; SdrMark* pM=nullptr; @@ -231,7 +231,7 @@ bool SdrMarkView::MarkPoints(const tools::Rectangle* pRect, bool bUnmark) void SdrMarkView::MarkNextPoint() { ForceUndirtyMrkPnt(); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); } const tools::Rectangle& SdrMarkView::GetMarkedPointsRect() const @@ -395,7 +395,7 @@ bool SdrMarkView::MarkGluePoints(const tools::Rectangle* pRect, bool bUnmark) if (!IsGluePointEditMode() && !bUnmark) return false; ForceUndirtyMrkPnt(); bool bChgd=false; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nMarkCount=GetMarkedObjectList().GetMarkCount(); for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { SdrMark* pM=GetMarkedObjectList().GetMark(nMarkNum); @@ -447,7 +447,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 OutputDevice* pOut=mpActualOutDev.get(); if (pOut==nullptr) pOut=GetFirstOutputDevice(); if (pOut==nullptr) return false; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nMarkCount=GetMarkedObjectList().GetMarkCount(); size_t nMarkNum=nMarkCount; while (nMarkNum>0) { @@ -535,7 +535,7 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) cons void SdrMarkView::MarkNextGluePoint() { ForceUndirtyMrkPnt(); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); } const tools::Rectangle& SdrMarkView::GetMarkedGluePointsRect() const diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 7185e0bc81ba..e30d06f27380 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -192,7 +192,7 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) if(!HasMarkedPoints()) return; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -226,7 +226,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) if(!HasMarkedPoints()) return; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -289,7 +289,7 @@ void SdrPolyEditView::DeleteMarkedPoints() return; BrkAction(); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nMarkCount=GetMarkedObjectList().GetMarkCount(); const bool bUndo = IsUndoEnabled(); @@ -337,7 +337,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints() if(!HasMarkedPoints()) return; - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nMarkCount(GetMarkedObjectList().GetMarkCount()); const bool bUndo = IsUndoEnabled(); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c8bf0484502d..f20e6006845c 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -855,10 +855,10 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (rVEvt.mbPrevNextMark) { bRet=MarkNextObj(aLogicPos, mnHitTolLog, rVEvt.mbMarkPrev); } else { - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nCount0=GetMarkedObjectList().GetMarkCount(); bRet=MarkObj(aLogicPos, mnHitTolLog, rVEvt.mbAddMark); - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); const size_t nCount1=GetMarkedObjectList().GetMarkCount(); bUnmark=nCount1<nCount0; } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 025ada793041..7039978f67b9 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -677,7 +677,7 @@ Graphic SdrExchangeView::GetObjGraphic(const SdrObject& rSdrObject, bool bSVG) ::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const { - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); ::std::vector< SdrObject* > aRetval; ::std::vector< ::std::vector< SdrMark* > > aObjVectors( 2 ); @@ -727,7 +727,7 @@ std::unique_ptr<SdrModel> SdrExchangeView::CreateMarkedObjModel() const { // Sorting the MarkList here might be problematic in the future, so // use a copy. - SortMarkedObjects(); + GetMarkedObjectList().ForceSort(); std::unique_ptr<SdrModel> pNewModel(GetModel().AllocModel()); rtl::Reference<SdrPage> pNewPage = pNewModel->AllocPage(false); pNewModel->InsertPage(pNewPage.get()); diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index d98f90487cc2..6e688df3eacd 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -973,7 +973,7 @@ void SwDrawView::ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView ) aMarkedObjs.pop_back(); } // sort marked list in order to assure consistent state in drawing layer - _rMarkView.SortMarkedObjects(); + _rMarkView.GetMarkedObjectList().ForceSort(); } SfxViewShell* SwDrawView::GetSfxViewShell() const commit f527bc48fc5c8812f6bc22ce10d7131d64e096ef Author: Xisco Fauli <[email protected]> AuthorDate: Wed May 29 13:07:38 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed May 29 17:07:23 2024 +0200 GetDescriptionOfMarkedObjects() -> GetMarkedObjectList().GetMarkDescription() In order to reduce number of calls to GetMarkedObjectList() later on Change-Id: I2a2c87c2552cfc9002a9afc7d8eefb16a601b784 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168216 Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 2d196780d6c6..92c788b1a828 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -263,7 +263,6 @@ public: SdrObject* GetMarkedObjectByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetMarkedSdrObj(); } void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } bool AreObjectsMarked() const { return 0 != GetMarkedObjectList().GetMarkCount(); } - OUString const & GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } // Get a list of all those links which are connected to marked nodes, // but which are not marked themselves. diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 1cbdf0f52e29..f3061927aaea 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -117,7 +117,7 @@ void ScGraphicShell::ExecuteFilter( const SfxRequest& rReq ) if( SdrPageView* pPageView = pView->GetSdrPageView() ) { rtl::Reference<SdrGrafObj> pFilteredObj = SdrObject::Clone(*pGraphicObj, pGraphicObj->getSdrModelFromSdrObject()); - OUString aStr = pView->GetDescriptionOfMarkedObjects() + " " + ScResId(SCSTR_UNDO_GRAFFILTER); + OUString aStr = pView->GetMarkedObjectList().GetMarkDescription() + " " + ScResId(SCSTR_UNDO_GRAFFILTER); pView->BegUndo( aStr ); pFilteredObj->SetGraphicObject( aFilterObj ); pView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj.get() ); @@ -208,7 +208,7 @@ void ScGraphicShell::ExecuteCompressGraphic( SAL_UNUSED_PARAMETER SfxRequest& ) { rtl::Reference<SdrGrafObj> pNewObject = dialog.GetCompressedSdrGrafObj(); SdrPageView* pPageView = pView->GetSdrPageView(); - OUString aUndoString = pView->GetDescriptionOfMarkedObjects() + " Compress"; + OUString aUndoString = pView->GetMarkedObjectList().GetMarkDescription() + " Compress"; pView->BegUndo( aUndoString ); pView->ReplaceObjectAtView( pObj, *pPageView, pNewObject.get() ); pView->EndUndo(); @@ -342,7 +342,7 @@ void ScGraphicShell::ExecuteChangePicture( SAL_UNUSED_PARAMETER SfxRequest& /*rR rtl::Reference<SdrGrafObj> pNewObject(SdrObject::Clone(*pGraphicObj, pGraphicObj->getSdrModelFromSdrObject())); pNewObject->SetGraphic( aGraphic ); SdrPageView* pPageView = pView->GetSdrPageView(); - OUString aUndoString = pView->GetDescriptionOfMarkedObjects() + " Change"; + OUString aUndoString = pView->GetMarkedObjectList().GetMarkDescription() + " Change"; pView->BegUndo( aUndoString ); pView->ReplaceObjectAtView( pObj, *pPageView, pNewObject.get() ); pView->EndUndo(); diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 99e5f7b87a3b..5edc4e2dc303 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -66,7 +66,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) return; // Undo - OUString aString = mpView->GetDescriptionOfMarkedObjects() + + OUString aString = mpView->GetMarkedObjectList().GetMarkDescription() + " " + SdResId( STR_UNDO_COPYOBJECTS ); mpView->BegUndo( aString ); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index c169f8925dcb..83ea1d1c1b03 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -162,7 +162,7 @@ void FuMorph::DoExecute( SfxRequest& ) ImpMorphPolygons(aPolyPoly1, aPolyPoly2, pDlg->GetFadeSteps(), aPolyPolyList); - OUString aString = mpView->GetDescriptionOfMarkedObjects() + + OUString aString = mpView->GetMarkedObjectList().GetMarkDescription() + " " + SdResId(STR_UNDO_MORPHING); mpView->BegUndo(aString); diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index aef7157ce9bc..864384ad125d 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -52,7 +52,7 @@ namespace { void setUndo(::sd::View* pView, const SfxItemSet* pArgs, bool addPageMargin) { // Undo - OUString aString = pView->GetDescriptionOfMarkedObjects() + + OUString aString = pView->GetMarkedObjectList().GetMarkDescription() + " " + SdResId(STR_TRANSFORM); pView->BegUndo(aString); pView->SetGeoAttrToMarked(*pArgs, addPageMargin); diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index d657c0d18ba0..63d0408979a3 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -73,7 +73,7 @@ void FuVectorize::DoExecute( SfxRequest& ) if( pPageView && rMtf.GetActionSize() ) { rtl::Reference<SdrGrafObj> pVectObj = SdrObject::Clone(static_cast<SdrGrafObj&>(*pObj), pObj->getSdrModelFromSdrObject()); - OUString aStr = mpView->GetDescriptionOfMarkedObjects() + + OUString aStr = mpView->GetMarkedObjectList().GetMarkDescription() + " " + SdResId( STR_UNDO_VECTORIZE ); mpView->BegUndo( aStr ); pVectObj->SetGraphic( rMtf ); diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index d94a556750b3..cabd82753878 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -116,7 +116,7 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest const & rReq ) if (SdrPageView* pPageView = mpView->GetSdrPageView()) { rtl::Reference<SdrGrafObj> pFilteredObj = SdrObject::Clone(static_cast<SdrGrafObj&>(*pObj), pObj->getSdrModelFromSdrObject()); - OUString aStr = mpView->GetDescriptionOfMarkedObjects() + + OUString aStr = mpView->GetMarkedObjectList().GetMarkDescription() + " " + SdResId(STR_UNDO_GRAFFILTER); mpView->BegUndo( aStr ); pFilteredObj->SetGraphicObject( aFilterObj ); diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 99c166002cbd..7d6a492146ff 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -545,7 +545,7 @@ void DrawView::DeleteMarked() if( pUndoManager ) { OUString aUndo(SvxResId(STR_EditDelete)); - aUndo = aUndo.replaceFirst("%1", GetDescriptionOfMarkedObjects()); + aUndo = aUndo.replaceFirst("%1", GetMarkedObjectList().GetMarkDescription()); ViewShellId nViewShellId = mpDrawViewShell ? mpDrawViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1); pUndoManager->EnterListAction(aUndo, aUndo, 0, nViewShellId); } diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 689b89c8b79f..39daf6b00cbf 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1433,7 +1433,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { rtl::Reference<SdrGrafObj> pNewObject = dialog.GetCompressedSdrGrafObj(); SdrPageView* pPageView = mpDrawView->GetSdrPageView(); - OUString aUndoString = mpDrawView->GetDescriptionOfMarkedObjects() + " Compress"; + OUString aUndoString = mpDrawView->GetMarkedObjectList().GetMarkDescription() + " Compress"; mpDrawView->BegUndo( aUndoString ); mpDrawView->ReplaceObjectAtView( pObj, *pPageView, pNewObject.get() ); mpDrawView->EndUndo(); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index befb7d582b39..cc27855f469d 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -297,7 +297,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest const & rReq ) xNewObj->SetEmptyPresObj(false); xNewObj->SetGraphic(pBmpMask->Mask(xNewObj->GetGraphic())); - OUString aStr = mpDrawView->GetDescriptionOfMarkedObjects() + + OUString aStr = mpDrawView->GetMarkedObjectList().GetMarkDescription() + " " + SdResId(STR_EYEDROPPER); mpDrawView->BegUndo( aStr ); diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 1ae793e4d60a..21c22a57994d 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -151,7 +151,7 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq) pNewGrafObj->SetOutlinerParaObject(std::nullopt); pNewGrafObj->SetGraphic(aGraphic); - OUString aStr = mpDrawView->GetDescriptionOfMarkedObjects() + + OUString aStr = mpDrawView->GetMarkedObjectList().GetMarkDescription() + " " + SdResId(STR_UNDO_REPLACE); mpDrawView->BegUndo(aStr); SdrPageView* pPV = mpDrawView->GetSdrPageView(); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index f48da6715287..561723063ad6 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -247,7 +247,7 @@ void View::DoCut() OUString aStr(SdResId(STR_UNDO_CUT)); DoCopy(); - BegUndo(aStr + " " + GetDescriptionOfMarkedObjects()); + BegUndo(aStr + " " + GetMarkedObjectList().GetMarkDescription()); DeleteMarked(); EndUndo(); } diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index 8126e491006d..693e81330d49 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -191,7 +191,7 @@ void SdrExternalToolEdit::Update(Graphic & rGraphic) rtl::Reference<SdrGrafObj> pNewObj = SdrObject::Clone(*m_pObj, m_pObj->getSdrModelFromSdrObject()); assert(pNewObj); OUString const description = - m_pView->GetDescriptionOfMarkedObjects() + " External Edit"; + m_pView->GetMarkedObjectList().GetMarkDescription() + " External Edit"; m_pView->BegUndo(description); pNewObj->SetGraphicObject(rGraphic); // set to new object before ReplaceObjectAtView() so that Notify() will diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 7f3548fad311..581b9216531b 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -804,7 +804,7 @@ void SdrEditView::DeleteMarkedObj() // moved breaking action and undo start outside loop BrkAction(); - BegUndo(SvxResId(STR_EditDelete),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Delete); + BegUndo(SvxResId(STR_EditDelete),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::Delete); std::vector<rtl::Reference<SdrObject>> lazyDeleteObjects; // remove as long as something is selected. This allows to schedule objects for diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index bc99b67017e6..2e349d273d44 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -190,7 +190,7 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy) if (bCopy) aStr += SvxResId(STR_EditWithCopy); // needs its own UndoGroup because of its parameters - BegUndo(aStr,GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Move); + BegUndo(aStr,GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::Move); } if (bCopy) @@ -1713,7 +1713,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr, bool addPageMargin ForcePossibilities(); - BegUndo(SvxResId(STR_EditTransform),GetDescriptionOfMarkedObjects()); + BegUndo(SvxResId(STR_EditTransform),GetMarkedObjectList().GetMarkDescription()); if (bSetAttr) { SetAttrToMarked(aSetAttr,false); @@ -1877,7 +1877,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert) if( bUndo ) { EndTextEditCurrentView(); - OUString aStr(GetDescriptionOfMarkedObjects()); + OUString aStr(GetMarkedObjectList().GetMarkDescription()); if (eHor==SdrHorAlign::NONE) { switch (eVert) diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index f372ac9c1f31..449e1b5535ae 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -78,7 +78,7 @@ void SdrEditView::MovMarkedToTop() const bool bUndo = IsUndoEnabled(); if( bUndo ) - BegUndo(SvxResId(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::MoveToTop); + BegUndo(SvxResId(STR_EditMovToTop),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::MoveToTop); SortMarkedObjects(); for (size_t nm=0; nm<nCount; ++nm) @@ -166,7 +166,7 @@ void SdrEditView::MovMarkedToBtm() const bool bUndo = IsUndoEnabled(); if( bUndo ) - BegUndo(SvxResId(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::MoveToBottom); + BegUndo(SvxResId(STR_EditMovToBtm),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::MoveToBottom); SortMarkedObjects(); for (size_t nm=0; nm<nCount; ++nm) @@ -261,7 +261,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) const bool bUndo = IsUndoEnabled(); if( bUndo ) - BegUndo(SvxResId(STR_EditPutToTop),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::PutToTop); + BegUndo(SvxResId(STR_EditPutToTop),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::PutToTop); SortMarkedObjects(); @@ -363,7 +363,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) const bool bUndo = IsUndoEnabled(); if( bUndo ) - BegUndo(SvxResId(STR_EditPutToBtm),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::PutToBottom); + BegUndo(SvxResId(STR_EditPutToBtm),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::PutToBottom); SortMarkedObjects(); if (pRefObj!=nullptr) @@ -445,7 +445,7 @@ void SdrEditView::ReverseOrderOfMarked() bool bUndo = IsUndoEnabled(); if( bUndo ) - BegUndo(SvxResId(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ReverseOrder); + BegUndo(SvxResId(STR_EditRevOrder),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::ReverseOrder); size_t a=0; do { @@ -1789,7 +1789,7 @@ void SdrEditView::GroupMarked() const bool bUndo = IsUndoEnabled(); if( bUndo ) { - BegUndo(SvxResId(STR_EditGroup),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Group); + BegUndo(SvxResId(STR_EditGroup),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::Group); for(size_t nm = GetMarkedObjectList().GetMarkCount(); nm>0; ) { @@ -2043,18 +2043,18 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea) else pDscrID = STR_EditConvToContours; - BegUndo(SvxResId(pDscrID), GetDescriptionOfMarkedObjects()); + BegUndo(SvxResId(pDscrID), GetMarkedObjectList().GetMarkDescription()); } else { if (bPath) { if (nMarkCount==1) pDscrID=STR_EditConvToCurve; else pDscrID=STR_EditConvToCurves; - BegUndo(SvxResId(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPath); + BegUndo(SvxResId(pDscrID),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::ConvertToPath); } else { if (nMarkCount==1) pDscrID=STR_EditConvToPoly; else pDscrID=STR_EditConvToPolys; - BegUndo(SvxResId(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPoly); + BegUndo(SvxResId(pDscrID),GetMarkedObjectList().GetMarkDescription(),SdrRepeatFunc::ConvertToPoly); } } for (size_t nm=nMarkCount; nm>0;) { diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 76b20ef5bc8f..bc18b67694fe 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -2735,7 +2735,7 @@ OUString SdrMarkView::ImpGetDescriptionString(TranslateId pStrCacheID, ImpGetDes } else { - sStr = sStr.replaceAt(nPos, 2, GetDescriptionOfMarkedObjects()); + sStr = sStr.replaceAt(nPos, 2, GetMarkedObjectList().GetMarkDescription()); } } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 6ddb8450657a..a580d739414b 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -503,7 +503,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) if( bUndo ) { - aUndoStr = rView.GetDescriptionOfMarkedObjects() + " "; + aUndoStr = rView.GetMarkedObjectList().GetMarkDescription() + " "; } const SfxItemSet* pArgs = rReq.GetArgs();
