cid#1545789 COPY_INSTEAD_OF_MOVE

and

cid#1545791 COPY_INSTEAD_OF_MOVE
cid#1545800 COPY_INSTEAD_OF_MOVE
cid#1545806 COPY_INSTEAD_OF_MOVE
cid#1545817 COPY_INSTEAD_OF_MOVE
cid#1545832 COPY_INSTEAD_OF_MOVE
cid#1545834 COPY_INSTEAD_OF_MOVE
cid#1545841 COPY_INSTEAD_OF_MOVE
cid#1545848 COPY_INSTEAD_OF_MOVE
cid#1545852 COPY_INSTEAD_OF_MOVE
cid#1545854 COPY_INSTEAD_OF_MOVE
cid#1545864 COPY_INSTEAD_OF_MOVE
cid#1545875 COPY_INSTEAD_OF_MOVE
cid#1545882 COPY_INSTEAD_OF_MOVE
cid#1545900 COPY_INSTEAD_OF_MOVE
cid#1545901 COPY_INSTEAD_OF_MOVE
cid#1545908 COPY_INSTEAD_OF_MOVE
cid#1545921 COPY_INSTEAD_OF_MOVE
cid#1546054 COPY_INSTEAD_OF_MOVE
cid#1546145 COPY_INSTEAD_OF_MOVE
cid#1546146 COPY_INSTEAD_OF_MOVE

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

4 files changed, 5 insertions, 10 deletions

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index d84549d43066..10db254a711f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -929,9 +929,8 @@ void SdtBlockHelper::GetSdtParamsFromGrabBag(const uno::Sequence<beans::Property
             aPropertyValue.Value >>= aGrabBag;
             for (const auto& rProp : std::as_const(aGrabBag))
             {
-                OUString sValue = rProp.Value.get<OUString>();
                 if (rProp.Name == "ooxml:CT_SdtPlaceholder_docPart_val")
-                    m_aPlaceHolderDocPart = sValue;
+                    m_aPlaceHolderDocPart = rProp.Value.get<OUString>();
             }
         }
         else if (aPropertyValue.Name == "ooxml:CT_SdtPr_color")
@@ -940,9 +939,8 @@ void SdtBlockHelper::GetSdtParamsFromGrabBag(const uno::Sequence<beans::Property
             aPropertyValue.Value >>= aGrabBag;
             for (const auto& rProp : std::as_const(aGrabBag))
             {
-                OUString sValue = rProp.Value.get<OUString>();
                 if (rProp.Name == "ooxml:CT_SdtColor_val")
-                    m_aColor = sValue;
+                    m_aColor = rProp.Value.get<OUString>();
             }
         }
         else if (aPropertyValue.Name == "ooxml:CT_SdtPr_appearance")
diff --git a/sw/source/ui/vba/vbacontentcontrol.cxx b/sw/source/ui/vba/vbacontentcontrol.cxx
index dc4e4afc236a..9cbf097090ee 100644
--- a/sw/source/ui/vba/vbacontentcontrol.cxx
+++ b/sw/source/ui/vba/vbacontentcontrol.cxx
@@ -37,7 +37,7 @@ SwVbaContentControl::SwVbaContentControl(const uno::Reference<XHelperInterface>&
                                          std::shared_ptr<SwContentControl> pContentControl)
     : SwVbaContentControl_BASE(rParent, rContext)
     , mxTextDocument(xTextDocument)
-    , m_pCC(pContentControl)
+    , m_pCC(std::move(pContentControl))
 {
     assert(m_pCC && "SwVbaContentControl created without a shared_ptr. Why would you do that?");
 }
diff --git a/sw/source/uibase/uno/loktxdoc.cxx b/sw/source/uibase/uno/loktxdoc.cxx
index 4843af4cf443..47527605f69a 100644
--- a/sw/source/uibase/uno/loktxdoc.cxx
+++ b/sw/source/uibase/uno/loktxdoc.cxx
@@ -450,9 +450,7 @@ void SwXTextDocument::getCommandValues(tools::JsonWriter& rJsonWriter, std::stri
             else
                 aValue = aToken;
         } while (nIndex >= 0);
-        OUString aDecodedValue
-            = INetURLObject::decode(aValue, INetURLObject::DecodeMechanism::WithCharset);
-        aMap[aKey] = aDecodedValue;
+        aMap[aKey] = INetURLObject::decode(aValue, INetURLObject::DecodeMechanism::WithCharset);
     } while (nParamIndex >= 0);
 
     if (o3tl::starts_with(rCommand, aTextFormFields))
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 7ea3d9db4e40..22de9f34a175 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -961,8 +961,7 @@ void SwAutoTextEventDescriptor::getByName(
 
     // return empty macro, unless macro is found
     OUString sEmptyStr;
-    SvxMacro aEmptyMacro(sEmptyStr, sEmptyStr);
-    rMacro = aEmptyMacro;
+    rMacro = SvxMacro(sEmptyStr, sEmptyStr);
 
     if ( !pBlocks || pBlocks->GetError())
         return;