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

loplugin:useuniqueptr in Outliner

Change-Id: I68568dd61ef6ba99fcb0ac386170bfe67ab2bbd7
Reviewed-on: https://gerrit.libreoffice.org/49174Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst add8b709
......@@ -1246,12 +1246,12 @@ Outliner::Outliner(SfxItemPool* pPool, OutlinerMode nMode)
, bPasting(false)
{
pParaList = new ParagraphList;
pParaList.reset( new ParagraphList );
pParaList->SetVisibleStateChangedHdl( LINK( this, Outliner, ParaVisibleStateChangedHdl ) );
Paragraph* pPara = new Paragraph( 0 );
pParaList->Append(pPara);
pEditEngine = new OutlinerEditEng( this, pPool );
pEditEngine.reset( new OutlinerEditEng( this, pPool ) );
pEditEngine->SetBeginMovingParagraphsHdl( LINK( this, Outliner, BeginMovingParagraphsHdl ) );
pEditEngine->SetEndMovingParagraphsHdl( LINK( this, Outliner, EndMovingParagraphsHdl ) );
pEditEngine->SetBeginPasteOrDropHdl( LINK( this, Outliner, BeginPasteOrDropHdl ) );
......@@ -1262,10 +1262,9 @@ Outliner::Outliner(SfxItemPool* pPool, OutlinerMode nMode)
Outliner::~Outliner()
{
pParaList->Clear();
delete pParaList;
delete pEditEngine;
pParaList.reset();
pEditEngine.reset();
}
size_t Outliner::InsertView( OutlinerView* pView, size_t nIndex )
......
......@@ -52,7 +52,7 @@ using namespace ::com::sun::star;
OutlinerView::OutlinerView( Outliner* pOut, vcl::Window* pWin )
{
pOwner = pOut;
pEditView.reset( new EditView( pOut->pEditEngine, pWin ) );
pEditView.reset( new EditView( pOut->pEditEngine.get(), pWin ) );
}
OutlinerView::~OutlinerView()
......
......@@ -587,9 +587,9 @@ private:
friend class TextChainingUtils;
OutlinerEditEng* pEditEngine;
std::unique_ptr<OutlinerEditEng> pEditEngine;
ParagraphList* pParaList;
std::unique_ptr<ParagraphList> pParaList;
ViewList aViewList;
sal_Int32 mnFirstSelPage;
......
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