summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorG_Zoltan <zolicsaba@yahoo.com>2016-12-27 23:54:05 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2016-12-31 18:04:06 +0000
commitf5bf80568eee020ccfe972831b9280859c798836 (patch)
tree4fdc5a5641d3d65d3beb0ed9fcb58dfc9379ee2e
parentdd801a6231bc0f7de2fe2d240869c34028aa70b3 (diff)
tdf#89329 pImpl changed to unique_ptr
In mailmrge.cxx/mailmrge.hxx manula allocated pImpl pointer is changed to std::unique_ptr. Change-Id: Icb973cdb449e59184a24c359c0ca9fe2da4a8ebd Reviewed-on: https://gerrit.libreoffice.org/32464 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 9074bbc53ce9..e6e35e678edc 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -375,7 +375,7 @@ void SwMailMergeDlg::dispose()
OUString* pData = static_cast< OUString* >( m_pFilterLB->GetEntryData(nFilter) );
delete pData;
}
- delete pImpl;
+ pImpl.reset();
m_pBeamerWin.clear();
m_pAllRB.clear();
m_pMarkedRB.clear();
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index 77036d086b01..8dfe82451a7e 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -91,7 +91,7 @@ class SwMailMergeDlg : public SvxStandardDialog
VclPtr<OKButton> m_pOkBTN;
- SwMailMergeDlg_Impl* pImpl;
+ std::unique_ptr<SwMailMergeDlg_Impl> pImpl;
SwWrtShell& rSh;
SwModuleOptions* pModOpt;