From d18a6a56d39bed7a427e4fa0d55ea816d1a0b76d Mon Sep 17 00:00:00 2001 From: Arnold Dumas Date: Mon, 13 Jun 2016 23:14:53 +0200 Subject: tdf#89329: use unique_ptr for m_pImpl in chardlg Change-Id: Ic7ac35ebdab7143d75a9f2c8d0e6f99796ffb0e3 Reviewed-on: https://gerrit.libreoffice.org/26232 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cui/source/inc/chardlg.hxx | 3 ++- cui/source/tabpages/chardlg.cxx | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 07daa789476d..5b115c1d28c2 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -26,6 +26,7 @@ #include #include #include +#include // forward --------------------------------------------------------------- @@ -104,7 +105,7 @@ private: VclPtr m_pCTLFontLanguageLB; VclPtr m_pCTLFontTypeFT; - SvxCharNamePage_Impl* m_pImpl; + std::unique_ptr m_pImpl; SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 1fcff9728a45..1edfee5c5d9d 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -374,8 +374,7 @@ SvxCharNamePage::~SvxCharNamePage() void SvxCharNamePage::dispose() { - delete m_pImpl; - m_pImpl = nullptr; + m_pImpl.reset(); m_pWestFrame.clear(); m_pWestFontNameFT.clear(); m_pWestFontNameLB.clear(); -- cgit v1.2.3