diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-05-29 13:07:38 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-05-29 17:07:23 +0200 |
commit | f527bc48fc5c8812f6bc22ce10d7131d64e096ef (patch) | |
tree | 28f41f7f252d433b4f0a3794c59d975f5277a9f0 /sd | |
parent | e73c7982b7c374b1b28535883bd8898edad25e50 (diff) |
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 <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/func/fucopy.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fumorph.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/futransf.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuvect.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/GraphicObjectBar.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drawview.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews6.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews9.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 |
10 files changed, 10 insertions, 10 deletions
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(); } |