summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/tabview5.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-07-16 16:41:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-07-17 14:03:19 +0200
commit4c2d0b0d85eabc5228b3777d3519482c52a0f96b (patch)
treedff08f6a2fb82ac477118c952b9741fc9373ee84 /sc/source/ui/view/tabview5.cxx
parentd6bd9c273483b12f1bb2ae398afdba977e3ec336 (diff)
loplugin:useuniqueptr in ScTabView
Change-Id: Ic506f5d350abbbbb5912e3ebf753e02821c76841 Reviewed-on: https://gerrit.libreoffice.org/57523 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/view/tabview5.cxx')
-rw-r--r--sc/source/ui/view/tabview5.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 962fc20e5c9f..c4e7768da626 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -79,17 +79,17 @@ void ScTabView::Init()
pGridWin[i] = nullptr;
pGridWin[SC_SPLIT_BOTTOMLEFT] = VclPtr<ScGridWindow>::Create( pFrameWin, &aViewData, SC_SPLIT_BOTTOMLEFT );
- pSelEngine = new ScViewSelectionEngine( pGridWin[SC_SPLIT_BOTTOMLEFT], this,
- SC_SPLIT_BOTTOMLEFT );
- aFunctionSet.SetSelectionEngine( pSelEngine );
+ pSelEngine.reset( new ScViewSelectionEngine( pGridWin[SC_SPLIT_BOTTOMLEFT], this,
+ SC_SPLIT_BOTTOMLEFT ) );
+ aFunctionSet.SetSelectionEngine( pSelEngine.get() );
- pHdrSelEng = new ScHeaderSelectionEngine( pFrameWin, &aHdrFunc );
+ pHdrSelEng.reset( new ScHeaderSelectionEngine( pFrameWin, &aHdrFunc ) );
pColBar[SC_SPLIT_LEFT] = VclPtr<ScColBar>::Create( pFrameWin, SC_SPLIT_LEFT,
- &aHdrFunc, pHdrSelEng, this );
+ &aHdrFunc, pHdrSelEng.get(), this );
pColBar[SC_SPLIT_RIGHT] = nullptr;
pRowBar[SC_SPLIT_BOTTOM] = VclPtr<ScRowBar>::Create( pFrameWin, SC_SPLIT_BOTTOM,
- &aHdrFunc, pHdrSelEng, this );
+ &aHdrFunc, pHdrSelEng.get(), this );
pRowBar[SC_SPLIT_TOP] = nullptr;
for (i=0; i<2; i++)
pColOutline[i] = pRowOutline[i] = nullptr;
@@ -193,16 +193,16 @@ ScTabView::~ScTabView()
}
pDrawView->HideSdrPage();
- delete pDrawView;
+ pDrawView.reset();
}
- delete pSelEngine;
+ pSelEngine.reset();
mxInputHintOO.reset();
for (i=0; i<4; i++)
pGridWin[i].disposeAndClear();
- delete pHdrSelEng;
+ pHdrSelEng.reset();
for (i=0; i<2; i++)
{
@@ -233,7 +233,7 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode )
OSL_ENSURE(pLayer, "Where is the Draw Layer ??");
sal_uInt16 i;
- pDrawView = new ScDrawView( pGridWin[SC_SPLIT_BOTTOMLEFT], &aViewData );
+ pDrawView.reset( new ScDrawView( pGridWin[SC_SPLIT_BOTTOMLEFT], &aViewData ) );
for (i=0; i<4; i++)
if (pGridWin[i])
{
@@ -250,7 +250,7 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode )
// so that immediately can be drawn
}
SfxRequest aSfxRequest(SID_OBJECT_SELECT, SfxCallMode::SLOT, aViewData.GetViewShell()->GetPool());
- SetDrawFuncPtr(new FuSelection(*aViewData.GetViewShell(), GetActiveWin(), pDrawView,
+ SetDrawFuncPtr(new FuSelection(*aViewData.GetViewShell(), GetActiveWin(), pDrawView.get(),
pLayer,aSfxRequest));
// used when switching back from page preview: restore saved design mode state
@@ -261,7 +261,7 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode )
// register at FormShell
FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell();
if (pFormSh)
- pFormSh->SetView(pDrawView);
+ pFormSh->SetView(pDrawView.get());
if (aViewData.GetViewShell()->HasAccessibilityObjects())
aViewData.GetViewShell()->BroadcastAccessibility(SfxHint(SfxHintId::ScAccMakeDrawLayer));