cid#1632259 COPY_INSTEAD_OF_MOVE

and

cid#1632258 COPY_INSTEAD_OF_MOVE
cid#1632257 COPY_INSTEAD_OF_MOVE
cid#1632256 COPY_INSTEAD_OF_MOVE
cid#1632255 COPY_INSTEAD_OF_MOVE
cid#1632254 COPY_INSTEAD_OF_MOVE
cid#1632253 COPY_INSTEAD_OF_MOVE
cid#1632252 COPY_INSTEAD_OF_MOVE
cid#1632251 COPY_INSTEAD_OF_MOVE
cid#1632250 COPY_INSTEAD_OF_MOVE
cid#1632249 COPY_INSTEAD_OF_MOVE
cid#1632248 COPY_INSTEAD_OF_MOVE
cid#1632247 COPY_INSTEAD_OF_MOVE
cid#1632246 COPY_INSTEAD_OF_MOVE
cid#1632245 COPY_INSTEAD_OF_MOVE
cid#1632244 COPY_INSTEAD_OF_MOVE
cid#1632243 COPY_INSTEAD_OF_MOVE
cid#1632242 COPY_INSTEAD_OF_MOVE
cid#1632241 COPY_INSTEAD_OF_MOVE
cid#1632240 COPY_INSTEAD_OF_MOVE
cid#1632239 COPY_INSTEAD_OF_MOVE
cid#1632238 COPY_INSTEAD_OF_MOVE
cid#1632237 COPY_INSTEAD_OF_MOVE
cid#1632236 COPY_INSTEAD_OF_MOVE
cid#1632235 COPY_INSTEAD_OF_MOVE
cid#1632234 COPY_INSTEAD_OF_MOVE
cid#1632233 COPY_INSTEAD_OF_MOVE
cid#1632232 COPY_INSTEAD_OF_MOVE
cid#1632231 COPY_INSTEAD_OF_MOVE
cid#1558073 COPY_INSTEAD_OF_MOVE
cid#1557945 COPY_INSTEAD_OF_MOVE
cid#1557916 COPY_INSTEAD_OF_MOVE
cid#1557898 COPY_INSTEAD_OF_MOVE
cid#1557808 COPY_INSTEAD_OF_MOVE

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

6 files changed, 6 insertions, 7 deletions

diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 8697b3a09235..d7078e09f30b 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -975,7 +975,7 @@ lcl_ExportHints(
                         {
                             pUnoCursor->Normalize(false);
                             pUnoCursor->DeleteMark();
-                            pPortion = xTmp;
+                            pPortion = std::move(xTmp);
                         }
                         else // just insert it
                         {
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 3380f6aa4b7d..e4d1628f33ef 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4433,7 +4433,7 @@ void SwXTextTableStyle::UpdateCellStylesMapping()
             xCellStyle.set(new SwXTextCellStyle(m_pDocShell, pBoxFormat, m_pTableAutoFormat->GetName()));
             pBoxFormat->SetXObject(xCellStyle);
         }
-        m_aCellStyles[i] = xCellStyle;
+        m_aCellStyles[i] = std::move(xCellStyle);
     }
 }
 
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 2880505e7db6..e1d9aea18593 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -436,9 +436,8 @@ void SwXTextDocument::GetNumberFormatter()
     {
         if ( m_pDocShell->GetDoc() )
         {
-            rtl::Reference<SvNumberFormatsSupplierObj> pNumFormat = new SvNumberFormatsSupplierObj(
+            m_xNumFormatAgg = new SvNumberFormatsSupplierObj(
                                 m_pDocShell->GetDoc()->GetNumberFormatter());
-            m_xNumFormatAgg = pNumFormat;
         }
         if(m_xNumFormatAgg.is())
             m_xNumFormatAgg->setDelegator(getXWeak());
diff --git a/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx b/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
index e0dcfc2ad939..2b43069cde96 100644
--- a/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -209,7 +209,7 @@ public:
 
     virtual void setModel(css::uno::Reference<css::frame::XModel> xModel) = 0;
     virtual css::uno::Reference<css::frame::XModel> getModel() = 0;
-    virtual void setDrawPage(rtl::Reference<SwFmDrawPage> xDrawPage) = 0;
+    virtual void setDrawPage(const rtl::Reference<SwFmDrawPage>& xDrawPage) = 0;
     virtual rtl::Reference<SwFmDrawPage> getDrawPage() = 0;
     virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) = 0;
     virtual void setXNoteId(const sal_Int32 nId) = 0;
diff --git a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
index 45ee7e19156e..086230b0d941 100644
--- a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
@@ -825,7 +825,7 @@ uno::Reference<frame::XModel> OOXMLDocumentImpl::getModel()
     return mxModel;
 }
 
-void OOXMLDocumentImpl::setDrawPage(rtl::Reference<SwFmDrawPage> xDrawPage)
+void OOXMLDocumentImpl::setDrawPage(const rtl::Reference<SwFmDrawPage>& xDrawPage)
 {
     mxDrawPage = xDrawPage;
 }
diff --git a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
index 1e86bc06763c..602432ddcf51 100644
--- a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
@@ -131,7 +131,7 @@ public:
 
     virtual void setModel(css::uno::Reference<css::frame::XModel> xModel) override;
     virtual css::uno::Reference<css::frame::XModel> getModel() override;
-    virtual void setDrawPage(rtl::Reference<SwFmDrawPage> xDrawPage) override;
+    virtual void setDrawPage(const rtl::Reference<SwFmDrawPage>& xDrawPage) override;
     virtual rtl::Reference<SwFmDrawPage> getDrawPage() override;
     virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) override;
     virtual void setXNoteId(const sal_Int32 nId) override;