sw/source/ui/envelp/mailmrge.cxx | 2 +-
sw/source/uibase/inc/mailmrge.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f5bf80568eee020ccfe972831b9280859c798836
Author: G_Zoltan <zolics...@yahoo.com>
Date: Tue Dec 27 23:54:05 2016 +0200
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.zol...@collabora.com>
Tested-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 9074bbc..e6e35e67 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 77036d0..8dfe824 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
