diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-31 15:40:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-12 08:43:48 +0200 |
| commit | e4e4d5713e248f02faf7aa6199b11e152973de8e (patch) | |
| tree | 836dffa89d0a966e41b1af8270db74b9590def22 /cui | |
| parent | d4eabd5da8ea3b5ac40659c22cde19b26b3c002b (diff) | |
clang-tidy readability-delete-null-pointer
which in turn triggered some loplugin:useuniqueptr
Change-Id: I0c38561fc9b68dac44e8cf58c8aa1f582196cc64
Reviewed-on: https://gerrit.libreoffice.org/38281
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 13 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index b70d6c57faf4..fdd046357b67 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -935,10 +935,6 @@ MenuSaveInData::MenuSaveInData( MenuSaveInData::~MenuSaveInData() { - if ( pRootEntry != nullptr ) - { - delete pRootEntry; - } } SvxEntries* @@ -946,16 +942,16 @@ MenuSaveInData::GetEntries() { if ( pRootEntry == nullptr ) { - pRootEntry = new SvxConfigEntry( "MainMenus", OUString(), true); + pRootEntry.reset( new SvxConfigEntry( "MainMenus", OUString(), true) ); if ( m_xMenuSettings.is() ) { - LoadSubMenus( m_xMenuSettings, OUString(), pRootEntry, false ); + LoadSubMenus( m_xMenuSettings, OUString(), pRootEntry.get(), false ); } else if ( GetDefaultData() != nullptr ) { // If the doc has no config settings use module config settings - LoadSubMenus( GetDefaultData()->m_xMenuSettings, OUString(), pRootEntry, false ); + LoadSubMenus( GetDefaultData()->m_xMenuSettings, OUString(), pRootEntry.get(), false ); } } @@ -1226,8 +1222,7 @@ MenuSaveInData::Reset() PersistChanges( GetConfigManager() ); - delete pRootEntry; - pRootEntry = nullptr; + pRootEntry.reset(); try { diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 329b69526522..0436f15888ec 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -168,7 +168,7 @@ private: css::uno::Reference < css::container::XIndexAccess > m_xMenuSettings; - SvxConfigEntry* pRootEntry; + std::unique_ptr<SvxConfigEntry> pRootEntry; static MenuSaveInData* pDefaultData; ///< static holder of the default menu data |