summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold Dumas <arnold@dumas.at>2016-06-13 23:14:53 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-14 11:08:07 +0000
commitd18a6a56d39bed7a427e4fa0d55ea816d1a0b76d (patch)
treeb9b25aa19279c23659e0d7b5b06616cc842def02
parent3db4830c4137563f68c92aef4a31f2a39ac00748 (diff)
tdf#89329: use unique_ptr for m_pImpl in chardlg
Change-Id: Ic7ac35ebdab7143d75a9f2c8d0e6f99796ffb0e3 Reviewed-on: https://gerrit.libreoffice.org/26232 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--cui/source/inc/chardlg.hxx3
-rw-r--r--cui/source/tabpages/chardlg.cxx3
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 <svx/checklbx.hxx>
#include <svx/langbox.hxx>
#include <vcl/layout.hxx>
+#include <memory>
// forward ---------------------------------------------------------------
@@ -104,7 +105,7 @@ private:
VclPtr<SvxLanguageBox> m_pCTLFontLanguageLB;
VclPtr<FixedText> m_pCTLFontTypeFT;
- SvxCharNamePage_Impl* m_pImpl;
+ std::unique_ptr<SvxCharNamePage_Impl> 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();