From fbe6619a34b617a04a5135e40c70a172a44eefef Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 13 Jan 2015 14:50:19 +0200
Subject: vcl: VclPtr conversion in sfx2

Change-Id: I78ea3f4304ace27c6db0e3d0651bd65043dcbc68
---
 sfx2/source/dialog/dockwin.cxx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'sfx2/source/dialog/dockwin.cxx')

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;
@@ -251,8 +252,14 @@ SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind ,
 }
 
 SfxTitleDockingWindow::~SfxTitleDockingWindow()
+{
+    dispose();
+}
+
+void SfxTitleDockingWindow::dispose()
 {
     delete m_pWrappedWindow;
+    SfxDockingWindow::dispose();
 }
 
 void SfxTitleDockingWindow::SetWrappedWindow( vcl::Window* const pWindow )
@@ -1266,9 +1273,15 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
 
 SfxDockingWindow::~SfxDockingWindow()
+{
+    dispose();
+}
+
+void SfxDockingWindow::dispose()
 {
     ReleaseChildWindow_Impl();
     delete pImp;
+    DockingWindow::dispose();
 }
 
 void SfxDockingWindow::ReleaseChildWindow_Impl()
-- 
cgit