diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-13 14:50:19 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 20:58:55 +0100 |
| commit | fbe6619a34b617a04a5135e40c70a172a44eefef (patch) | |
| tree | 4cc507a0e9c6d9e6317b814f3a9a0e63e6301226 /sfx2/source/dialog/dockwin.cxx | |
| parent | ce8cfbd3b90f11c3f2edc88a0dab625aabb6293d (diff) | |
vcl: VclPtr conversion in sfx2
Change-Id: I78ea3f4304ace27c6db0e3d0651bd65043dcbc68
Diffstat (limited to 'sfx2/source/dialog/dockwin.cxx')
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 7118b2824e74..06fe979d582e 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -71,8 +71,9 @@ public: vcl::Window* pParent , WinBits nBits); virtual ~SfxTitleDockingWindow(); + virtual void dispose() SAL_OVERRIDE; - vcl::Window* GetWrappedWindow() const { return m_pWrappedWindow; } + vcl::Window* GetWrappedWindow() const { return m_pWrappedWindow; } void SetWrappedWindow(vcl::Window* const pWindow); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; @@ -252,7 +253,13 @@ SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind , SfxTitleDockingWindow::~SfxTitleDockingWindow() { + dispose(); +} + +void SfxTitleDockingWindow::dispose() +{ delete m_pWrappedWindow; + SfxDockingWindow::dispose(); } void SfxTitleDockingWindow::SetWrappedWindow( vcl::Window* const pWindow ) @@ -1267,8 +1274,14 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const SfxDockingWindow::~SfxDockingWindow() { + dispose(); +} + +void SfxDockingWindow::dispose() +{ ReleaseChildWindow_Impl(); delete pImp; + DockingWindow::dispose(); } void SfxDockingWindow::ReleaseChildWindow_Impl() |