diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-26 13:23:37 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:02:04 +0100 |
commit | 584e6c6051d8a8371941d61603672891a8aa3013 (patch) | |
tree | b1f050db216c528ac8a68521b045b39a051ecdfc /sw/source/ui/envelp/mailmrge.cxx | |
parent | 45515c06d26d8a37e683f939b60198ee55343e55 (diff) |
vcl: VclPtr conversion in sw
Change-Id: Ie084a4b14f8371ff81fe6a95e73660e38cd376f2
Diffstat (limited to 'sw/source/ui/envelp/mailmrge.cxx')
-rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 00da8162d562..315f0965c65c 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -389,6 +389,11 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, SwMailMergeDlg::~SwMailMergeDlg() { + dispose(); +} + +void SwMailMergeDlg::dispose() +{ if(m_xFrame.is()) { m_xFrame->setComponent(NULL, NULL); @@ -401,6 +406,7 @@ SwMailMergeDlg::~SwMailMergeDlg() delete pData; } delete pImpl; + SvxStandardDialog::dispose(); } void SwMailMergeDlg::Apply() |