vcl: VclPtr conversion in sw

Change-Id: Ie084a4b14f8371ff81fe6a95e73660e38cd376f2

3 files changed, 25 insertions, 0 deletions

diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index cb31042c14de..5d0567df4ed0 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -174,7 +174,13 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
 
 SwConvertTableDlg:: ~SwConvertTableDlg()
 {
+    dispose();
+}
+
+void SwConvertTableDlg::dispose()
+{
     delete pTAutoFmt;
+    SfxModalDialog::dispose();
 }
 
 IMPL_LINK( SwConvertTableDlg, AutoFmtHdl, PushButton*, pButton )
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 56e6c02f36c7..817667f020d9 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -137,7 +137,13 @@ IMPL_LINK_NOARG(SwInsTableDlg, OKHdl)
 
 SwInsTableDlg::~SwInsTableDlg()
 {
+    dispose();
+}
+
+void SwInsTableDlg::dispose()
+{
     delete pTAutoFmt;
+    SfxModalDialog::dispose();
 }
 
 IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 8a8c02aa56f0..49107998bec0 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -49,6 +49,7 @@ class AutoFmtPreview : public vcl::Window
 public:
     AutoFmtPreview(vcl::Window* pParent, WinBits nStyle);
     virtual ~AutoFmtPreview();
+    virtual void dispose() SAL_OVERRIDE;
 
     void NotifyChange( const SwTableAutoFmt& rNewData );
 
@@ -174,9 +175,15 @@ SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell,
 
 SwAutoFormatDlg::~SwAutoFormatDlg()
 {
+    dispose();
+}
+
+void SwAutoFormatDlg::dispose()
+{
     if (bCoreDataChanged)
         pTableTbl->Save();
     delete pTableTbl;
+    SfxModalDialog::dispose();
 }
 
 void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt )
@@ -537,7 +544,13 @@ void AutoFmtPreview::DetectRTL(SwWrtShell* pWrtShell)
 
 AutoFmtPreview::~AutoFmtPreview()
 {
+    dispose();
+}
+
+void AutoFmtPreview::dispose()
+{
     delete pNumFmt;
+    vcl::Window::dispose();
 }
 
 static void lcl_SetFontProperties(