diff options
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 |