From 584e6c6051d8a8371941d61603672891a8aa3013 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 26 Jan 2015 13:23:37 +0200
Subject: vcl: VclPtr conversion in sw

Change-Id: Ie084a4b14f8371ff81fe6a95e73660e38cd376f2
---
 sw/source/ui/fldui/changedb.cxx | 7 +++++++
 sw/source/ui/fldui/fldedt.cxx   | 6 ++++++
 sw/source/ui/fldui/javaedit.cxx | 6 ++++++
 3 files changed, 19 insertions(+)

(limited to 'sw/source/ui/fldui')

diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index d5a171d3b0af..a2a9c7c1e6b6 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -163,9 +163,16 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName)
 
 // destroy dialog
 SwChangeDBDlg::~SwChangeDBDlg()
+{
+    dispose();
+}
+
+void SwChangeDBDlg::dispose()
 {
     delete pMgr;
+    SvxStandardDialog::dispose();
 }
+
 // close
 void SwChangeDBDlg::Apply()
 {
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 32dd26eebaff..fc40ec580b7c 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -213,9 +213,15 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
 }
 
 SwFldEditDlg::~SwFldEditDlg()
+{
+    dispose();
+}
+
+void SwFldEditDlg::dispose()
 {
     SwViewShell::SetCareWin(NULL);
     pSh->EnterStdMode();
+    SfxSingleTabDialog::dispose();
 }
 
 void SwFldEditDlg::EnableInsert(bool bEnable)
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 8bf330418207..8a7cf86638a6 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -87,11 +87,17 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
 }
 
 SwJavaEditDialog::~SwJavaEditDialog()
+{
+    dispose();
+}
+
+void SwJavaEditDialog::dispose()
 {
     pSh->EnterStdMode();
     delete pMgr;
     delete pFileDlg;
     Application::SetDefDialogParent( pOldDefDlgParent );
+    SvxStandardDialog::dispose();
 }
 
 IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
-- 
cgit