From caa25f8e5f39e95fec1b32e352c841a6c0bf2fb3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 17 Jan 2019 15:51:51 +0200 Subject: pass SvxMSDffImportRec around using unique_ptr Change-Id: Ib2a93682f6d2745489e07cf04e3509146213c7ee Reviewed-on: https://gerrit.libreoffice.org/66571 Tested-by: Jenkins Reviewed-by: Noel Grandin --- filter/source/msfilter/msdffimp.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'filter') diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 06deedf59392..e9e6cbfe2f24 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5056,10 +5056,10 @@ SvxMSDffImportRec* SvxMSDffImportData::find(const SdrObject* pObj) return nullptr; } -void SvxMSDffImportData::insert(SvxMSDffImportRec* pImpRec) +void SvxMSDffImportData::insert(std::unique_ptr pImpRec) { - m_ObjToRecMap[pImpRec->pObj] = pImpRec; - m_Records.insert(std::unique_ptr(pImpRec)); + m_ObjToRecMap[pImpRec->pObj] = pImpRec.get(); + m_Records.insert(std::move(pImpRec)); } void SvxMSDffImportData::NotifyFreeObj(SdrObject* pObj) @@ -5576,7 +5576,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, if( pOrgObj ) { pImpRec->pObj = pOrgObj; - rImportData.insert(pImpRec); + rImportData.insert(std::unique_ptr(pImpRec)); bDeleteImpRec = false; if (pImpRec == pTextImpRec) bDeleteTextImpRec = false; @@ -5587,7 +5587,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, // Modify ShapeId (must be unique) pImpRec->nShapeId |= 0x8000000; pTextImpRec->pObj = pTextObj; - rImportData.insert(pTextImpRec); + rImportData.insert(std::unique_ptr(pTextImpRec)); bDeleteTextImpRec = false; if (pTextImpRec == pImpRec) bDeleteImpRec = false; -- cgit