diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-11 16:05:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-20 16:21:20 +0200 |
| commit | d19c6ab1050fb3f3ef60a3622bca85ebb07952e4 (patch) | |
| tree | e2f93f655bcbff5dd6593ed96458cfd09309e358 /sc/inc | |
| parent | 370a30b6acc5b99b6046440f6b5f4f3f5f9f4b1a (diff) | |
loplugin:useuniqueptr in ScColContainer
Change-Id: Icb4fffb27535a767b307c1d01e5bc96372c98352
Reviewed-on: https://gerrit.libreoffice.org/56108
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/colcontainer.hxx | 3 | ||||
| -rw-r--r-- | sc/inc/table.hxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx index 9bd9c16e260b..2cb4ae74e487 100644 --- a/sc/inc/colcontainer.hxx +++ b/sc/inc/colcontainer.hxx @@ -22,13 +22,14 @@ #include "types.hxx" +#include <memory> #include <vector> class ScColumn; class ScColContainer { - typedef std::vector<ScColumn*> ScColumnVector; + typedef std::vector<std::unique_ptr<ScColumn>> ScColumnVector; ScColumnVector aCols; public: diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index a2aa4c911b57..e7886b15c6ee 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -117,7 +117,7 @@ class ScColumnsRange final public: class Iterator final { - std::vector<ScColumn*>::const_iterator maColIter; + std::vector<std::unique_ptr<ScColumn>>::const_iterator maColIter; public: typedef std::input_iterator_tag iterator_category; typedef SCCOL value_type; @@ -125,7 +125,7 @@ class ScColumnsRange final typedef const SCCOL* pointer; typedef SCCOL reference; - explicit Iterator(const std::vector<ScColumn*>::const_iterator& colIter) : maColIter(colIter) {} + explicit Iterator(const std::vector<std::unique_ptr<ScColumn>>::const_iterator& colIter) : maColIter(colIter) {} Iterator& operator++() { ++maColIter; return *this;} Iterator& operator--() { --maColIter; return *this;} |