summaryrefslogtreecommitdiff
path: root/cui/source/inc/treeopt.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/inc/treeopt.hxx')
-rw-r--r--cui/source/inc/treeopt.hxx14
1 files changed, 2 insertions, 12 deletions
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 274076d9d99f..3eadd58ef5d4 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -73,8 +73,6 @@ struct OptionsLeaf
m_nGroupIndex( nGroupIndex ) {}
};
-typedef std::vector< OptionsLeaf* > VectorOfLeaves;
-
// struct OptionsNode ----------------------------------------------------
struct OptionsNode
@@ -83,8 +81,8 @@ struct OptionsNode
OUString m_sLabel;
OUString m_sPageURL;
bool m_bAllModules;
- VectorOfLeaves m_aLeaves;
- std::vector< VectorOfLeaves >
+ std::vector< std::unique_ptr<OptionsLeaf> > m_aLeaves;
+ std::vector< std::vector< std::unique_ptr<OptionsLeaf> > >
m_aGroupedLeaves;
OptionsNode( const OUString& rId,
@@ -95,14 +93,6 @@ struct OptionsNode
m_sLabel( rLabel ),
m_sPageURL( rPageURL ),
m_bAllModules( bAllModules ) {}
-
- ~OptionsNode()
- {
- for ( size_t i = 0; i < m_aLeaves.size(); ++i )
- delete m_aLeaves[i];
- m_aLeaves.clear();
- m_aGroupedLeaves.clear();
- }
};
typedef std::vector< OptionsNode* > VectorOfNodes;