cid#1546006 COPY_INSTEAD_OF_MOVE

and

cid#1545999 COPY_INSTEAD_OF_MOVE
cid#1545995 COPY_INSTEAD_OF_MOVE
cid#1545994 COPY_INSTEAD_OF_MOVE
cid#1545989 COPY_INSTEAD_OF_MOVE
cid#1545982 COPY_INSTEAD_OF_MOVE
cid#1545977 COPY_INSTEAD_OF_MOVE
cid#1545970 COPY_INSTEAD_OF_MOVE
cid#1545856 COPY_INSTEAD_OF_MOVE
cid#1545845 COPY_INSTEAD_OF_MOVE
cid#1545838 COPY_INSTEAD_OF_MOVE
cid#1545776 COPY_INSTEAD_OF_MOVE
cid#1545774 COPY_INSTEAD_OF_MOVE
cid#1545744 COPY_INSTEAD_OF_MOVE
cid#1545719 COPY_INSTEAD_OF_MOVE
cid#1545716 COPY_INSTEAD_OF_MOVE
cid#1545687 COPY_INSTEAD_OF_MOVE
cid#1545648 COPY_INSTEAD_OF_MOVE
cid#1545643 COPY_INSTEAD_OF_MOVE
cid#1545641 COPY_INSTEAD_OF_MOVE
cid#1545604 COPY_INSTEAD_OF_MOVE
cid#1545531 COPY_INSTEAD_OF_MOVE
cid#1545530 COPY_INSTEAD_OF_MOVE
cid#1545524 COPY_INSTEAD_OF_MOVE
cid#1545516 COPY_INSTEAD_OF_MOVE
cid#1545501 COPY_INSTEAD_OF_MOVE
cid#1545486 COPY_INSTEAD_OF_MOVE

Change-Id: Idcf3e27bb9e81b6a77d5ef75c9376eb1d6aff8c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161245
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 6bbd4c2e18aa..83e3c74cf216 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -166,14 +166,13 @@ void XclImpChangeTrack::Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, Exc
         XclImpUrlHelper::DecodeUrl( aUrl, bSelf, GetRoot(), aEncUrl );
         pStrm->Ignore( 1 );
         // - sheet name, always separated from URL
-        OUString aTabName( pStrm->ReadUniString() );
+        rExtInfo.maTabName = pStrm->ReadUniString();
         pStrm->Ignore( 1 );
 
         rExtInfo.mbExternal = true;
         ScExternalRefManager* pRefMgr = GetDoc().GetExternalRefManager();
         pRefMgr->convertToAbsName(aUrl);
         rExtInfo.mnFileId = pRefMgr->getExternalFileId(aUrl);
-        rExtInfo.maTabName = aTabName;
         rFirstTab = rLastTab = 0;
     }
 }
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 4de5b1950183..e86ec2f13577 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1858,9 +1858,10 @@ void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller,
 
                         VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScStyleDlg(GetActiveDialogParent(), *pStyleSheet, true));
 
-                        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([this, pDlg, pRequest, pStyleSheet, aOldData, aOldName, &rStyleSet, nCurTab, &rCaller, bUndo](sal_Int32 nResult){
+                        pDlg->StartExecuteAsync([this, pDlg, xRequest=std::move(xRequest), pStyleSheet, aOldData,
+                                                 aOldName, &rStyleSet, nCurTab, &rCaller, bUndo](sal_Int32 nResult) {
                             if ( nResult == RET_OK )
                             {
                                 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
@@ -1896,7 +1897,7 @@ void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller,
                                 }
 
                                 PageStyleModified( aNewName, false );
-                                pRequest->Done();
+                                xRequest->Done();
                             }
                             pDlg->disposeOnce();
                         });
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 679378bbafb8..21e6cb736b7a 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -476,7 +476,7 @@ void ScDrawShell::ExecuteLineDlg( const SfxRequest& rReq )
     const SdrObject*    pObj        = nullptr;
     const SdrMarkList&  rMarkList   = pView->GetMarkedObjectList();
 
-    std::shared_ptr<SfxRequest> pRequest = std::make_shared<SfxRequest>(rReq);
+    std::shared_ptr<SfxRequest> xRequest = std::make_shared<SfxRequest>(rReq);
 
     if( rMarkList.GetMarkCount() == 1 )
         pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -492,7 +492,7 @@ void ScDrawShell::ExecuteLineDlg( const SfxRequest& rReq )
             pObj,
             bHasMarked));
 
-    pDlg->StartExecuteAsync([pDlg, pRequest, pView, bHasMarked](sal_Int32 nResult){
+    pDlg->StartExecuteAsync([pDlg, xRequest=std::move(xRequest), pView, bHasMarked](sal_Int32 nResult){
         if ( nResult == RET_OK )
         {
             if( bHasMarked )
@@ -501,7 +501,7 @@ void ScDrawShell::ExecuteLineDlg( const SfxRequest& rReq )
                 pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), false );
 
             pView->InvalidateAttribs();
-            pRequest->Done();
+            xRequest->Done();
         }
         pDlg->disposeOnce();
     });
@@ -512,7 +512,7 @@ void ScDrawShell::ExecuteAreaDlg( const SfxRequest& rReq )
     ScDrawView* pView       = rViewData.GetScDrawView();
     bool        bHasMarked  = pView->AreObjectsMarked();
 
-    std::shared_ptr<SfxRequest> pRequest = std::make_shared<SfxRequest>(rReq);
+    std::shared_ptr<SfxRequest> xRequest = std::make_shared<SfxRequest>(rReq);
 
     SfxItemSet  aNewAttr( pView->GetDefaultAttr() );
     if( bHasMarked )
@@ -524,7 +524,7 @@ void ScDrawShell::ExecuteAreaDlg( const SfxRequest& rReq )
         pWin, &aNewAttr,
         rViewData.GetDocument().GetDrawLayer(), true, false));
 
-    pDlg->StartExecuteAsync([pDlg, pRequest, pView, bHasMarked](sal_Int32 nResult){
+    pDlg->StartExecuteAsync([pDlg, xRequest=std::move(xRequest), pView, bHasMarked](sal_Int32 nResult){
         if ( nResult == RET_OK )
         {
             if( bHasMarked )
@@ -533,7 +533,7 @@ void ScDrawShell::ExecuteAreaDlg( const SfxRequest& rReq )
                 pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), false );
 
             pView->InvalidateAttribs();
-            pRequest->Done();
+            xRequest->Done();
         }
         pDlg->disposeOnce();
     });