diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-11 14:05:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-13 11:39:21 +0000 |
| commit | 414ede0435645a2ebf8f1476435b6ec3bb248f33 (patch) | |
| tree | 97f4fc1f1f3a3b9c077ae11348baa6fed6852f9b /sc/inc/dptabres.hxx | |
| parent | d05f56b160390022fdb0c21eed5e430440cd79ca (diff) | |
new loplugin: useuniqueptr: sc part 1
Change-Id: Ic96fd3b56b2063df0882168a7d02725d3c50515f
Reviewed-on: https://gerrit.libreoffice.org/32961
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc/dptabres.hxx')
| -rw-r--r-- | sc/inc/dptabres.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 65dbf5dbb4d1..7b6e7d1d5aaa 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -159,12 +159,12 @@ private: double fVal; double fAux; long nCount; - ScDPAggData* pChild; + std::unique_ptr<ScDPAggData> pChild; std::vector<double> mSortedValues; public: ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY), pChild(nullptr) {} - ~ScDPAggData() { delete pChild; } + ~ScDPAggData() {} void Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); @@ -183,7 +183,7 @@ public: void Reset(); // also deletes children - const ScDPAggData* GetExistingChild() const { return pChild; } + const ScDPAggData* GetExistingChild() const { return pChild.get(); } ScDPAggData* GetChild(); #if DUMP_PIVOT_TABLE @@ -437,8 +437,9 @@ class ScDPDataMember private: const ScDPResultData* pResultData; const ScDPResultMember* pResultMember; //! Ref? - ScDPDataDimension* pChildDimension; - ScDPAggData aAggregate; + std::unique_ptr<ScDPDataDimension> + pChildDimension; + ScDPAggData aAggregate; void UpdateValues( const ::std::vector<ScDPValue>& aValues, const ScDPSubTotalState& rSubState ); @@ -486,8 +487,8 @@ public: #endif //! this will be removed! - const ScDPDataDimension* GetChildDimension() const { return pChildDimension; } - ScDPDataDimension* GetChildDimension() { return pChildDimension; } + const ScDPDataDimension* GetChildDimension() const { return pChildDimension.get(); } + ScDPDataDimension* GetChildDimension() { return pChildDimension.get(); } }; typedef std::vector<ScDPDataMember*> ScDPDataMembers; |