diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-16 15:49:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-24 07:56:34 +0100 |
| commit | 7b7c388fe402e14486664e36eeb6c1f0fe1e02b9 (patch) | |
| tree | dba1c3e84d72ff54a57e495fbe8decac150b5146 | |
| parent | b3b22ee3de5ddfc73e44a2d425450b1deeb3ed0d (diff) | |
loplugin:useuniqueptr in GroupData_Impl
Change-Id: Icddaf78a58b74338ac763c12c8ac06f464986cac
Reviewed-on: https://gerrit.libreoffice.org/48371
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 61bf957b5713..80d6ce983667 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -346,7 +346,7 @@ public: class GroupData_Impl { - vector< DocTemplates_EntryData_Impl* > maEntries; + std::vector< std::unique_ptr<DocTemplates_EntryData_Impl> > maEntries; OUString maTitle; OUString maHierarchyURL; OUString maTargetURL; @@ -355,7 +355,6 @@ class GroupData_Impl public: explicit GroupData_Impl( const OUString& rTitle ); - ~GroupData_Impl(); void setInUse() { mbInUse = true; } void setHierarchy( bool bInHierarchy ) { mbInHierarchy = bInHierarchy; } @@ -373,7 +372,7 @@ public: const OUString& rType, const OUString& rHierURL ); size_t count() { return maEntries.size(); } - DocTemplates_EntryData_Impl* getEntry( size_t nPos ) { return maEntries[ nPos ]; } + DocTemplates_EntryData_Impl* getEntry( size_t nPos ) { return maEntries[ nPos ].get(); } }; @@ -2641,14 +2640,6 @@ GroupData_Impl::GroupData_Impl( const OUString& rTitle ) } -GroupData_Impl::~GroupData_Impl() -{ - for (DocTemplates_EntryData_Impl* p : maEntries) - delete p; - maEntries.clear(); -} - - DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, const OUString& rTargetURL, const OUString& rType, @@ -2657,9 +2648,9 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, DocTemplates_EntryData_Impl* pData = nullptr; bool EntryFound = false; - for (DocTemplates_EntryData_Impl* p : maEntries) + for (auto const & p : maEntries) { - pData = p; + pData = p.get(); if ( pData->getTitle() == rTitle ) { EntryFound = true; @@ -2677,7 +2668,7 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, pData->setHierarchyURL( rHierURL ); pData->setHierarchy( true ); } - maEntries.push_back( pData ); + maEntries.emplace_back( pData ); } else { |