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>

2 files changed, 9 insertions, 9 deletions

diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 39b7fb3c7227..c96945ccdf30 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2971,16 +2971,16 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
                 auto const& pTheme = pModel->getTheme();
                 if (pTheme)
                 {
-                    std::shared_ptr<svx::IThemeColorChanger> pChanger(new sw::ThemeColorChanger(pDocumentShell));
+                    std::shared_ptr<svx::IThemeColorChanger> xChanger(new sw::ThemeColorChanger(pDocumentShell));
                     auto pDialog = std::make_shared<svx::ThemeDialog>(pMDI, pTheme.get());
-                    weld::DialogController::runAsync(pDialog, [pDialog, pChanger](sal_uInt32 nResult) {
+                    weld::DialogController::runAsync(pDialog, [pDialog, xChanger=std::move(xChanger)](sal_uInt32 nResult) {
                         if (RET_OK != nResult)
                             return;
 
                         auto pColorSet = pDialog->getCurrentColorSet();
                         if (pColorSet)
                         {
-                            pChanger->apply(pColorSet);
+                            xChanger->apply(pColorSet);
                             if (comphelper::LibreOfficeKit::isActive())
                             {
                                 svx::ThemeColorPaletteManager aManager(pColorSet);
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(),