From dd891ec422fb35eada219ca7adddbd60d69f1fb7 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Sun, 22 Jan 2017 13:23:57 +0100 Subject: cppcheck: memleak (false positive) but manage ownership from start Change-Id: Ia9d29cc0e0676173c231c8b68b7681cc1b3dff86 Reviewed-on: https://gerrit.libreoffice.org/33392 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- editeng/source/editeng/editobj.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 3f1f70f5c681..3e3e8b7d3ec3 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1404,11 +1404,11 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) aNewFontItem.SetFamilyName( GetFontToSubsFontName( hConv ) ); // Replace the existing attribute with a new one. - XEditAttribute* pNewAttr = CreateAttrib(aNewFontItem, rAttr.GetStart(), rAttr.GetEnd()); - + pC->maCharAttribs[nAttr] = + std::unique_ptr(CreateAttrib(aNewFontItem, rAttr.GetStart(), rAttr.GetEnd())); pPool->Remove(*rAttr.GetItem()); - pC->maCharAttribs[nAttr] = std::unique_ptr(pNewAttr); + XEditAttribute* pNewAttr = pC->maCharAttribs[nAttr].get(); for ( sal_uInt16 nChar = pNewAttr->GetStart(); nChar < pNewAttr->GetEnd(); nChar++ ) { sal_Unicode cOld = pC->GetText()[ nChar ]; -- cgit