diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-20 19:24:48 +0100 |
---|---|---|
committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-20 23:03:28 +0200 |
commit | d33d592801fa3c865613d9bdf4d715d8b1f637ca (patch) | |
tree | 0932380209d481f345fcb0cb78bf27c6cde43694 /sw | |
parent | f12f05dae44bab39aed24fdc63f52e0e1d2e5bdc (diff) |
cid#1554791 COPY_INSTEAD_OF_MOVE
and
cid#1554819 COPY_INSTEAD_OF_MOVE
cid#1554837 COPY_INSTEAD_OF_MOVE
cid#1554881 COPY_INSTEAD_OF_MOVE
cid#1554882 COPY_INSTEAD_OF_MOVE
cid#1554884 COPY_INSTEAD_OF_MOVE
cid#1554891 COPY_INSTEAD_OF_MOVE
cid#1554892 COPY_INSTEAD_OF_MOVE
cid#1554897 COPY_INSTEAD_OF_MOVE
cid#1554904 COPY_INSTEAD_OF_MOVE
cid#1554918 COPY_INSTEAD_OF_MOVE
cid#1554928 COPY_INSTEAD_OF_MOVE
cid#1554931 COPY_INSTEAD_OF_MOVE
cid#1554944 COPY_INSTEAD_OF_MOVE
cid#1554945 COPY_INSTEAD_OF_MOVE
cid#1554959 COPY_INSTEAD_OF_MOVE
cid#1554960 COPY_INSTEAD_OF_MOVE
cid#1554963 COPY_INSTEAD_OF_MOVE
cid#1554966 COPY_INSTEAD_OF_MOVE
cid#1554969 COPY_INSTEAD_OF_MOVE
cid#1554973 COPY_INSTEAD_OF_MOVE
cid#1555011 COPY_INSTEAD_OF_MOVE
cid#1555012 COPY_INSTEAD_OF_MOVE
cid#1555015 COPY_INSTEAD_OF_MOVE
cid#1555044 COPY_INSTEAD_OF_MOVE
cid#1555051 COPY_INSTEAD_OF_MOVE
cid#1555055 COPY_INSTEAD_OF_MOVE
cid#1555063 COPY_INSTEAD_OF_MOVE
cid#1555068 COPY_INSTEAD_OF_MOVE
cid#1555073 COPY_INSTEAD_OF_MOVE
cid#1555074 COPY_INSTEAD_OF_MOVE
cid#1555078 COPY_INSTEAD_OF_MOVE
cid#1555080 COPY_INSTEAD_OF_MOVE
cid#1555091 COPY_INSTEAD_OF_MOVE
cid#1555099 COPY_INSTEAD_OF_MOVE
cid#1555101 COPY_INSTEAD_OF_MOVE
cid#1555121 COPY_INSTEAD_OF_MOVE
cid#1610739 COPY_INSTEAD_OF_MOVE
cid#1608424 COPY_INSTEAD_OF_MOVE
cid#1608059 COPY_INSTEAD_OF_MOVE
cid#1607952 COPY_INSTEAD_OF_MOVE
cid#1607653 COPY_INSTEAD_OF_MOVE
cid#1607614 COPY_INSTEAD_OF_MOVE
cid#1607592 COPY_INSTEAD_OF_MOVE
Change-Id: Ie9f922a9fe1b8001dfab31e2741fe8bd5558e442
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170802
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/access/accpara.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docredln.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unotext.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewsrch.cxx | 8 | ||||
-rw-r--r-- | sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 6 | ||||
-rw-r--r-- | sw/source/writerfilter/dmapper/TableData.hxx | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 64a1e622c272..8ba66ce80a11 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1717,7 +1717,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( if ( !aRequestedAttributes.hasElements() ) { - rRunAttrSeq = aRunAttrSeq; + rRunAttrSeq = std::move(aRunAttrSeq); } else { diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index a092c19a6e68..c4575aef2bc7 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -4255,7 +4255,7 @@ void SwCursorShell::GetSmartTagRect( const Point& rPt, SwRect& rSelectRect ) aPos.SetContent( nBegin + nLeft ); pCursor = GetCursor(); - *pCursor->GetPoint() = aPos; + *pCursor->GetPoint() = std::move(aPos); pCursor->SetMark(); ExtendSelection( true, nLen - nLeft - nRight ); // do not determine the rectangle in the current line diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 2283febbf429..a71224f2eac8 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -2124,7 +2124,7 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos) } SetMark(); - *GetPoint() = aPos; + *GetPoint() = std::move(aPos); GetMark()->Assign(aNdIdx.GetIndex() + 1); pCNd = GetMark()->GetNode().GetContentNode(); if( pCNd ) diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 4de4897ab223..e569b4c40f18 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1555,7 +1555,7 @@ SwXText::convertToTextFrame( bParaAfterInserted = GetDoc()->getIDocumentContentOperations().AppendTextNode( aEnd ); pEndPam->DeleteMark(); *pEndPam->GetPoint() = aEnd; - *oAnchorCheckPam->End() = aEnd; + *oAnchorCheckPam->End() = std::move(aEnd); } pStartPam->SetMark(); *pStartPam->End() = *pEndPam->End(); diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index f92c44cea183..31ba3ff8e7d4 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1266,7 +1266,7 @@ void SwTextShell::Execute(SfxRequest &rReq) rReq.Ignore(); // the 'old' request is not relevant any more VclPtr<AbstractSwModalRedlineAcceptDlg> pDlg(pFact->CreateSwModalRedlineAcceptDlg(GetView().GetEditWin().GetFrameWeld())); pDlg->StartExecuteAsync( - [pDlg, xRequest] (sal_Int32 /*nResult*/)->void + [pDlg, xRequest=std::move(xRequest)] (sal_Int32 /*nResult*/)->void { pDlg->disposeOnce(); xRequest->Done(); diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index c03492adfc30..8234cf5501af 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -694,13 +694,13 @@ void SwView::Replace() if(! s_pSrchItem->GetBackward() ) { - (* m_pWrtShell->GetCursor()->Start()) = aStartPos; - (* m_pWrtShell->GetCursor()->End()) = aEndPos; + (* m_pWrtShell->GetCursor()->Start()) = std::move(aStartPos); + (* m_pWrtShell->GetCursor()->End()) = std::move(aEndPos); } else { - (* m_pWrtShell->GetCursor()->Start()) = aEndPos; - (* m_pWrtShell->GetCursor()->End()) = aStartPos; + (* m_pWrtShell->GetCursor()->Start()) = std::move(aEndPos); + (* m_pWrtShell->GetCursor()->End()) = std::move(aStartPos); } bReqReplace = false; } diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index 62b7849f8a56..5c22378a166f 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -1534,7 +1534,7 @@ uno::Any DomainMapper_Impl::GetPropertyFromParaStyleSheet(PropertyIds eId) pEntry = GetStyleSheetTable()->GetCurrentEntry(); else pEntry = GetStyleSheetTable()->FindStyleSheetByConvertedStyleName(GetCurrentParaStyleName()); - return GetPropertyFromStyleSheet(eId, pEntry, /*bDocDefaults=*/true, /*bPara=*/true); + return GetPropertyFromStyleSheet(eId, std::move(pEntry), /*bDocDefaults=*/true, /*bPara=*/true); } uno::Any DomainMapper_Impl::GetInheritedParaProperty(PropertyIds eId) @@ -1547,7 +1547,7 @@ uno::Any DomainMapper_Impl::GetInheritedParaProperty(PropertyIds eId) pEntry = GetStyleSheetTable()->FindStyleSheetByConvertedStyleName(GetCurrentParaStyleName()); const bool bCheckDocDefaults = !IsDocDefaultsImport(); - return GetPropertyFromStyleSheet(eId, pEntry, bCheckDocDefaults, /*bPara=*/true); + return GetPropertyFromStyleSheet(eId, std::move(pEntry), bCheckDocDefaults, /*bPara=*/true); } uno::Any DomainMapper_Impl::GetPropertyFromCharStyleSheet(PropertyIds eId, const PropertyMapPtr& rContext) @@ -1559,7 +1559,7 @@ uno::Any DomainMapper_Impl::GetPropertyFromCharStyleSheet(PropertyIds eId, const OUString sCharStyleName; if ( GetAnyProperty(PROP_CHAR_STYLE_NAME, rContext) >>= sCharStyleName ) pEntry = GetStyleSheetTable()->FindStyleSheetByConvertedStyleName(sCharStyleName); - return GetPropertyFromStyleSheet(eId, pEntry, /*bDocDefaults=*/false, /*bPara=*/false); + return GetPropertyFromStyleSheet(eId, std::move(pEntry), /*bDocDefaults=*/false, /*bPara=*/false); } uno::Any DomainMapper_Impl::GetAnyProperty(PropertyIds eId, const PropertyMapPtr& rContext) diff --git a/sw/source/writerfilter/dmapper/TableData.hxx b/sw/source/writerfilter/dmapper/TableData.hxx index ded929696e5a..c87e291f7d2f 100644 --- a/sw/source/writerfilter/dmapper/TableData.hxx +++ b/sw/source/writerfilter/dmapper/TableData.hxx @@ -74,7 +74,7 @@ public: @param pProps the properties to add */ - void insertProperties(TablePropertyMapPtr pProps) + void insertProperties(const TablePropertyMapPtr& pProps) { if( mpProps ) mpProps->InsertProps(pProps.get()); @@ -194,7 +194,7 @@ public: @param pProperties the properties to set */ - void insertProperties(TablePropertyMapPtr pProperties) + void insertProperties(const TablePropertyMapPtr& pProperties) { if( pProperties ) { |