editeng/source/items/xmlcnitm.cxx | 2 +- lotuswordpro/source/filter/lwppara1.cxx | 2 +- sc/source/core/data/markdata.cxx | 2 +- sc/source/filter/excel/xiescher.cxx | 2 +- sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit cbf9b547b685ef0dd3cdf143987176b01c007d56 Author: Noel Grandin <n...@peralex.com> Date: Thu Aug 4 10:07:15 2016 +0200 use std::move in a few places found by git grep -n '.reset.*.release' Change-Id: I498709bd32b21d9dbbaa73603ce21d21c274f8dc Reviewed-on: https://gerrit.libreoffice.org/27863 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noelgran...@gmail.com> diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 96cbd49..07883f6 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -141,7 +141,7 @@ bool SvXMLAttrContainerItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nM } if( nAttr == nCount ) - pImpl.reset( pNewImpl.release() ); + pImpl = std::move(pNewImpl); else return false; } diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 7499af4..58436d09 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -542,7 +542,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps) pOver->OverrideLevel(m_nLevel); } - m_pParaNumbering.reset(pOver.release()); + m_pParaNumbering = std::move(pOver); } void LwpPara::FindLayouts() diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index 9cb5329..39a5728 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -721,7 +721,7 @@ void ScMarkData::GetSelectionCover( ScRange& rRange ) if ( bCurColUnMarked ) pPrevColMarkedRows.reset( nullptr ); else - pPrevColMarkedRows.reset( pCurColMarkedRows.release() ); + pPrevColMarkedRows = std::move( pCurColMarkedRows ); } for( auto& rKV : aRowToColSegmentsInTopEnvelope ) { diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 30ccf35..e22d69a 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3546,7 +3546,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO // try to create a custom SdrObject that overwrites the passed object SdrObjectPtr xNewSdrObj( xDrawObj->CreateSdrObject( *this, rAnchorRect, true ) ); if( xNewSdrObj ) - xSdrObj.reset( xNewSdrObj.release() ); + xSdrObj = std::move( xNewSdrObj ); // process the SdrObject if( xSdrObj ) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index e77e164..b489623 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4894,7 +4894,7 @@ void DocxAttributeOutput::WritePostponedDMLDrawing() } m_bStartedParaSdt = bStartedParaSdt; - m_pPostponedOLEs.reset(pPostponedOLEs.release()); + m_pPostponedOLEs = std::move(pPostponedOLEs); } void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const Point& rNdTopLeft ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits