diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-04 11:56:06 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-05 08:07:30 +0200 |
commit | d46061c3190b66cbf698f6ff5e97ec1fd9fe0d44 (patch) | |
tree | e8481e72545178be922e94bb9785083f74d57531 /sw/source/uibase | |
parent | 35a7dd63dd8e2c8489ef95c661d5373247f7ed3b (diff) |
use more std::move in sw/
Change-Id: Id2f063550db3a3110e4bae8e18d0e7b9a7bf5df3
Reviewed-on: https://gerrit.libreoffice.org/61368
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/utlui/content.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
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<SwContentArr> 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; |