Kaydet (Commit) 3a5a3ebe authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in ScAccessibleCellTextData

and remove unused mpEditViewForwarder field

Change-Id: I844a935852ba9cb81606a98aff9454a73c3fe347
Reviewed-on: https://gerrit.libreoffice.org/52545Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 28bfc9ba
......@@ -659,8 +659,6 @@ void ScEditViewForwarder::SetInvalid()
ScAccessibleCellTextData::ScAccessibleCellTextData(ScTabViewShell* pViewShell,
const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell)
: ScAccessibleCellBaseTextData(GetDocShell(pViewShell), rP),
mpViewForwarder(nullptr),
mpEditViewForwarder(nullptr),
mpViewShell(pViewShell),
meSplitPos(eSplitPos),
mpAccessibleCell( pAccCell )
......@@ -671,8 +669,7 @@ ScAccessibleCellTextData::~ScAccessibleCellTextData()
{
if (pEditEngine)
pEditEngine->SetNotifyHdl(Link<EENotify&,void>());
delete mpViewForwarder;
delete mpEditViewForwarder;
mpViewForwarder.reset();
}
void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
......@@ -682,8 +679,6 @@ void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
mpViewShell = nullptr; // invalid now
if (mpViewForwarder)
mpViewForwarder->SetInvalid();
if (mpEditViewForwarder)
mpEditViewForwarder->SetInvalid();
}
ScAccessibleCellBaseTextData::Notify(rBC, rHint);
}
......@@ -842,8 +837,8 @@ SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder()
SvxViewForwarder* ScAccessibleCellTextData::GetViewForwarder()
{
if (!mpViewForwarder)
mpViewForwarder = new ScViewForwarder(mpViewShell, meSplitPos, aCellPos);
return mpViewForwarder;
mpViewForwarder.reset(new ScViewForwarder(mpViewShell, meSplitPos, aCellPos));
return mpViewForwarder.get();
}
SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( bool /* bCreate */ )
......
......@@ -90,8 +90,7 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) override;
private:
ScViewForwarder* mpViewForwarder;
ScEditViewForwarder* mpEditViewForwarder;
std::unique_ptr<ScViewForwarder> mpViewForwarder;
ScTabViewShell* mpViewShell;
ScSplitPos meSplitPos;
ScAccessibleCell* mpAccessibleCell;
......
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