From ff8442fd85f2e281a564e3dc832a751a3a9c3072 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 10 Apr 2018 16:07:49 +0200 Subject: pass EditTextObject around using std::unique_ptr Change-Id: I71f4529c2e02fd0ac2561191e4cb35e18e206037 Reviewed-on: https://gerrit.libreoffice.org/52682 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/filter/ww8/ww8graf.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/source/filter/ww8/ww8graf.cxx') diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 1b165cfdef64..bf921f3c9c44 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -984,10 +984,10 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP m_pDrawEditEngine->QuickDelete(aFirstChar); } - EditTextObject* pTemporaryText = m_pDrawEditEngine->CreateTextObject(); + std::unique_ptr pTemporaryText = m_pDrawEditEngine->CreateTextObject(); pRet = new OutlinerParaObject(*pTemporaryText); pRet->SetOutlinerMode( OutlinerMode::TextObject ); - delete pTemporaryText; + pTemporaryText.reset(); m_pDrawEditEngine->SetText( OUString() ); m_pDrawEditEngine->SetParaAttribs(0, m_pDrawEditEngine->GetEmptyItemSet()); @@ -1193,11 +1193,11 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, } bool bVertical = pTextObj->IsVerticalWriting(); - EditTextObject* pTemporaryText = m_pDrawEditEngine->CreateTextObject(); + std::unique_ptr pTemporaryText = m_pDrawEditEngine->CreateTextObject(); OutlinerParaObject* pOp = new OutlinerParaObject(*pTemporaryText); pOp->SetOutlinerMode( OutlinerMode::TextObject ); pOp->SetVertical( bVertical ); - delete pTemporaryText; + pTemporaryText.reset(); pTextObj->NbcSetOutlinerParaObject( pOp ); pTextObj->SetVerticalWriting(bVertical); -- cgit v1.2.3