diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2016-11-23 16:59:23 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2016-11-24 00:40:34 +0000 |
| commit | 7fe08af6b1c579dc12da836b6bcfa2f84734328a (patch) | |
| tree | b5ce58c968801b2626752ccccdab8ff478d5ddf4 /sc/source/ui/view/tabvwsh4.cxx | |
| parent | d9a6e0023c9a192850b9db00f8120fbcc4256ec9 (diff) | |
Use std::unique_ptr for the input handler instance here.
Change-Id: I73024b4d49bc99fa2110f5f0f0b80f950ad57baa
Reviewed-on: https://gerrit.libreoffice.org/31137
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'sc/source/ui/view/tabvwsh4.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index f3b4666653f1..edf2953668c9 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -40,6 +40,7 @@ #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <vcl/openglwin.hxx> +#include <o3tl/make_unique.hxx> #include "tabvwsh.hxx" #include "sc.hrc" @@ -126,7 +127,7 @@ void ScTabViewShell::Activate(bool bMDI) // RegisterNewTargetNames does not exist anymore SfxViewFrame* pThisFrame = GetViewFrame(); - if ( pInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) ) + if ( mpInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) ) { // actually only required for Reload (last version): // The InputWindow remains, but the View along with the InputHandler is newly created, @@ -151,7 +152,7 @@ void ScTabViewShell::Activate(bool bMDI) pSh = SfxViewShell::GetNext( *pSh, true, checkSfxViewShell<ScTabViewShell> ); } - pWin->SetInputHandler( pInputHandler ); + pWin->SetInputHandler( mpInputHandler.get() ); } } } @@ -1502,7 +1503,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode ) // As an intermediate solution each View gets its own InputHandler, // which only yields problems if two Views are in one task window. - pInputHandler = new ScInputHandler; + mpInputHandler = o3tl::make_unique<ScInputHandler>(); // old version: // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE or Plug-In @@ -1655,7 +1656,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, pExtrusionBarShell(nullptr), pFontworkBarShell(nullptr), pFormShell(nullptr), - pInputHandler(nullptr), + mpInputHandler(nullptr), pCurFrameLine(nullptr), aTarget(this), pDialogDPObject(nullptr), @@ -1765,8 +1766,8 @@ ScTabViewShell::~ScTabViewShell() // all to NULL, in case the TabView-dtor tries to access them //! (should not really! ??!?!) - if (pInputHandler) - pInputHandler->SetDocumentDisposing(true); + if (mpInputHandler) + mpInputHandler->SetDocumentDisposing(true); DELETEZ(pFontworkBarShell); DELETEZ(pExtrusionBarShell); @@ -1783,7 +1784,7 @@ ScTabViewShell::~ScTabViewShell() DELETEZ(pPivotShell); DELETEZ(pAuditingShell); DELETEZ(pCurFrameLine); - DELETEZ(pInputHandler); + mpInputHandler.reset(); DELETEZ(pPivotSource); DELETEZ(pDialogDPObject); DELETEZ(pNavSettings); |