include/svx/numvset.hxx | 2 +- svx/source/dialog/svxbmpnumvalueset.cxx | 6 +++--- sw/source/ui/envelp/envfmt.cxx | 2 +- sw/source/uibase/shells/textsh1.cxx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 18b7d1895d5ca160761955fd70a09ce0de1171c8 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 13 20:33:44 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jul 14 15:15:22 2024 +0200 cid#1608349 COPY_INSTEAD_OF_MOVE Change-Id: I00f4afb09907b91c4d180a9dd7464226bb327af3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170443 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index d3b6e71a69e1..7b96ffa6ee01 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -87,7 +87,7 @@ public: const css::lang::Locale& rLocale); std::vector<std::pair<OUString, OUString>> GetCustomBullets() { return maCustomBullets; } - void SetCustomBullets(std::vector<std::pair<OUString, OUString>> aCustomBullets); + void SetCustomBullets(const std::vector<std::pair<OUString, OUString>>& rCustomBullets); virtual FactoryFunction GetUITestFactory() const override; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index a934a972cf74..ed2e9bfaf80a 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -458,11 +458,11 @@ void SvxNumValueSet::SetOutlineNumberingSettings( } } -void SvxNumValueSet::SetCustomBullets(std::vector<std::pair<OUString, OUString>> aCustomBullets) +void SvxNumValueSet::SetCustomBullets(const std::vector<std::pair<OUString, OUString>>& rCustomBullets) { Clear(); - maCustomBullets = aCustomBullets; - for (size_t i = 0; i < aCustomBullets.size(); i++) + maCustomBullets = rCustomBullets; + for (size_t i = 0; i < rCustomBullets.size(); i++) { InsertItem(i + 1, i); } commit c6d168749b41483d184d0882feae7d8486aa3da3 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 13 20:19:24 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jul 14 15:15:15 2024 +0200 cid#1608424 COPY_INSTEAD_OF_MOVE Change-Id: Id56d0bf130e2c0a5935a577b82db6c6edd4c7610 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170442 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index c8ae3dded2c2..9b0d76746541 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1310,7 +1310,7 @@ void SwTextShell::Execute(SfxRequest &rReq) auto xRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more pDlg->StartExecuteAsync( - [pDlg, xRequest] (sal_Int32 nResult)->void + [pDlg, xRequest=std::move(xRequest)] (sal_Int32 nResult)->void { if (nResult == RET_OK) pDlg->Apply(); commit a625049ead3d61f4ed5721b0abafad335aa5f081 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 13 20:14:38 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jul 14 15:15:09 2024 +0200 cid#1608453 COPY_INSTEAD_OF_MOVE Change-Id: I059fb6a6b3af58ecedcf14c347adbb698348da1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170441 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 4fdab3132d05..cea77abbdb80 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -191,7 +191,7 @@ void SwEnvFormatPage::Edit(std::u16string_view rIdent, bool bSender) const OUString sFormatStr = pColl->GetName(); VclPtr<SfxAbstractTabDialog> pDlg(rFact.CreateSwCharDlg(GetFrameWeld(), pSh->GetView(), *xTmpSet, SwCharDlgMode::Env, &sFormatStr)); pDlg->StartExecuteAsync( - [pDlg, xTmpSet, pCollSet] (sal_Int32 nResult)->void + [pDlg, xTmpSet=std::move(xTmpSet), pCollSet] (sal_Int32 nResult)->void { if (nResult == RET_OK) {
