diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-23 19:04:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-24 13:23:45 +0100 |
| commit | 88987316ed0536de6c2c1e407fea4ecf77b5d5fc (patch) | |
| tree | 33daa996748f5d458536429bf0a9d99fa6c896f4 /sw/source/uibase/shells/txtnum.cxx | |
| parent | ba12e22f28150ec00d55e4fb99838710a3973e57 (diff) | |
cid#1545470 COPY_INSTEAD_OF_MOVE
and
cid#1545468 COPY_INSTEAD_OF_MOVE
cid#1545446 COPY_INSTEAD_OF_MOVE
cid#1545435 COPY_INSTEAD_OF_MOVE
cid#1545419 COPY_INSTEAD_OF_MOVE
cid#1545415 COPY_INSTEAD_OF_MOVE
cid#1545410 COPY_INSTEAD_OF_MOVE
cid#1545390 COPY_INSTEAD_OF_MOVE
cid#1545384 COPY_INSTEAD_OF_MOVE
cid#1545374 COPY_INSTEAD_OF_MOVE
cid#1545371 COPY_INSTEAD_OF_MOVE
cid#1545368 COPY_INSTEAD_OF_MOVE
cid#1545366 COPY_INSTEAD_OF_MOVE
cid#1545335 COPY_INSTEAD_OF_MOVE
cid#1545331 COPY_INSTEAD_OF_MOVE
cid#1545327 COPY_INSTEAD_OF_MOVE
cid#1545308 COPY_INSTEAD_OF_MOVE
cid#1545280 COPY_INSTEAD_OF_MOVE
cid#1545199 COPY_INSTEAD_OF_MOVE
Change-Id: If05a13125b05ccd93d34d0eced566e7b3b58aaef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161256
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sw/source/uibase/shells/txtnum.cxx')
| -rw-r--r-- | sw/source/uibase/shells/txtnum.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index e769b7f46347..2c25e966c300 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -197,17 +197,17 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) if ( pPageItem ) pDlg->SetCurPageId( pPageItem->GetValue() ); - 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, pNumRuleAtCurrentSelection, pRequest, this](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, pNumRuleAtCurrentSelection, xRequest=std::move(xRequest), this](sal_Int32 nResult){ if (RET_OK == nResult) { const SvxNumBulletItem* pBulletItem = pDlg->GetOutputItemSet()->GetItemIfSet(SID_ATTR_NUMBERING_RULE, false); if (pBulletItem) { - pRequest->AppendItem(*pBulletItem); - pRequest->Done(); + xRequest->AppendItem(*pBulletItem); + xRequest->Done(); SvxNumRule& rSetRule = const_cast<SvxNumRule&>(pBulletItem->GetNumRule()); rSetRule.UnLinkGraphics(); SwNumRule aSetRule(pNumRuleAtCurrentSelection != nullptr @@ -226,8 +226,8 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) else if (pNumRuleAtCurrentSelection == nullptr && (pBulletItem = pDlg->GetInputItemSet()->GetItemIfSet(SID_ATTR_NUMBERING_RULE, false))) { - pRequest->AppendItem(*pBulletItem); - pRequest->Done(); + xRequest->AppendItem(*pBulletItem); + xRequest->Done(); const SvxNumRule& rSetRule = pBulletItem->GetNumRule(); SwNumRule aSetRule( GetShell().GetUniqueNumRuleName(), |