From d46061c3190b66cbf698f6ff5e97ec1fd9fe0d44 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 4 Oct 2018 11:56:06 +0200 Subject: use more std::move in sw/ Change-Id: Id2f063550db3a3110e4bae8e18d0e7b9a7bf5df3 Reviewed-on: https://gerrit.libreoffice.org/61368 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/uibase/utlui/content.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sw/source/uibase/utlui/content.cxx') diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index a0de7d4f3cfa..91b1024aa9d8 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -343,12 +343,12 @@ void SwContentType::Init(bool* pbInvalidateWindow) break; case ContentTypeId::REGION : { - SwContentArr* pOldMember = nullptr; + std::unique_ptr pOldMember; if(!pMember) pMember.reset( new SwContentArr ); else if(!pMember->empty()) { - pOldMember = pMember.release(); + pOldMember = std::move(pMember); pMember.reset( new SwContentArr ); } const Point aNullPt; @@ -398,8 +398,6 @@ void SwContentType::Init(bool* pbInvalidateWindow) *pOldMember, *pMember); } - - delete pOldMember; } } break; -- cgit