Kaydet (Commit) 92ac45b1 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in ScAccessibleHeaderTextData

Change-Id: I545988d672b9b07ab7930ce280d93ced8b31f327
Reviewed-on: https://gerrit.libreoffice.org/52761Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst d43fa87f
......@@ -1325,8 +1325,8 @@ ScAccessibleHeaderTextData::~ScAccessibleHeaderTextData()
mpDocSh->GetDocument().RemoveUnoObject(*this);
if (mpEditEngine)
mpEditEngine->SetNotifyHdl(Link<EENotify&,void>());
delete mpEditEngine;
delete mpForwarder;
mpEditEngine.reset();
mpForwarder.reset();
}
ScAccessibleTextData* ScAccessibleHeaderTextData::Clone() const
......@@ -1351,7 +1351,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
{
SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges();
ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool );
std::unique_ptr<ScHeaderEditEngine> pHdrEngine(new ScHeaderEditEngine( pEnginePool ));
pHdrEngine->EnableUndo( false );
pHdrEngine->SetRefMapMode(MapMode(MapUnit::MapTwip));
......@@ -1380,12 +1380,12 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
ScHeaderFooterTextObj::FillDummyFieldData( aData );
pHdrEngine->SetData( aData );
mpEditEngine = pHdrEngine;
mpForwarder = new SvxEditEngineForwarder(*mpEditEngine);
mpEditEngine = std::move(pHdrEngine);
mpForwarder.reset(new SvxEditEngineForwarder(*mpEditEngine));
}
if (mbDataValid)
return mpForwarder;
return mpForwarder.get();
if ( mpViewShell )
{
......@@ -1401,7 +1401,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
mpEditEngine->SetText(*mpEditObj);
mbDataValid = true;
return mpForwarder;
return mpForwarder.get();
}
SvxViewForwarder* ScAccessibleHeaderTextData::GetViewForwarder()
......
......@@ -216,8 +216,8 @@ public:
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
ScEditEngineDefaulter* mpEditEngine;
SvxEditEngineForwarder* mpForwarder;
std::unique_ptr<ScEditEngineDefaulter> mpEditEngine;
std::unique_ptr<SvxEditEngineForwarder> mpForwarder;
ScDocShell* mpDocSh;
const EditTextObject* mpEditObj;
bool mbHeader;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment