diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-21 20:39:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-22 00:10:39 +0100 |
| commit | 03d7ff28b377d65cf266ff86292e581f48c98eee (patch) | |
| tree | d663b93cadc156eb62fba3f7eb69b075931d6c45 /sc/source/ui | |
| parent | 557579ec55fdeb6d1f1c4395080f72c803630567 (diff) | |
cid#1546500 COPY_INSTEAD_OF_MOVE
and
cid#1546492 COPY_INSTEAD_OF_MOVE
cid#1546468 COPY_INSTEAD_OF_MOVE
cid#1546431 COPY_INSTEAD_OF_MOVE
cid#1546382 COPY_INSTEAD_OF_MOVE
cid#1546350 COPY_INSTEAD_OF_MOVE
cid#1546336 COPY_INSTEAD_OF_MOVE
cid#1546314 COPY_INSTEAD_OF_MOVE
cid#1546152 COPY_INSTEAD_OF_MOVE
cid#1546094 COPY_INSTEAD_OF_MOVE
cid#1546077 COPY_INSTEAD_OF_MOVE
cid#1546047 COPY_INSTEAD_OF_MOVE
cid#1545213 COPY_INSTEAD_OF_MOVE
Change-Id: Ia51df9f9cbde755db4d2685e34f22676ed5eceff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161141
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshf.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index c332c9542a66..46baa40875fb 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -615,10 +615,10 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OUString &rNam if (!rName.isEmpty()) pDlg->SetCurPageId(rName); - auto pRequest = std::make_shared<SfxRequest>(rReq); + auto xRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more - pDlg->StartExecuteAsync([pDlg, pOldSet, pRequest, this](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, pOldSet, xRequest=std::move(xRequest), this](sal_Int32 nResult){ bInFormatDialog = false; if ( nResult == RET_OK ) @@ -631,7 +631,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OUString &rNam ApplyAttributes(*pOutSet, *pOldSet); - pRequest->Done(*pOutSet); + xRequest->Done(*pOutSet); } pDlg->disposeOnce(); diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 2ac3b93760a5..42d629508bc8 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -163,8 +163,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } } - std::shared_ptr<SfxRequest> pReq = std::make_shared<SfxRequest>(rReq); - pDlg->StartExecuteAsync([this, pDlg, pReq](sal_Int32 nResult){ + std::shared_ptr<SfxRequest> xReq = std::make_shared<SfxRequest>(rReq); + pDlg->StartExecuteAsync([this, pDlg, xReq = std::move(xReq)](sal_Int32 nResult){ std::vector<OUString> sTables; if (RET_OK == nResult) { @@ -172,11 +172,11 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) for (auto a : aSelectedRows) { OUString sTable = pDlg->GetEntry(a); - pReq->AppendItem( SfxStringItem( FID_TABLE_SHOW, sTable ) ); + xReq->AppendItem( SfxStringItem( FID_TABLE_SHOW, sTable ) ); sTables.push_back(sTable); } ShowTable( sTables ); - pReq->Done(); + xReq->Done(); } pDlg->disposeOnce(); }); |