diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-20 17:03:48 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-21 08:28:23 +0200 |
commit | 8ce072a7dcc14750cf50a76a5da49cd84412314c (patch) | |
tree | 6496d5aaba23d19944b72bffa60f8a8a6777a195 /sc/inc/dpobject.hxx | |
parent | 5652727f2bfa2bce77e83de718e3f599fe5eebcd (diff) |
loplugin:useuniqueptr in ScDPObject
Change-Id: I6e1f44d4e59ef15f08692e97ad90c3ffc23cdc8c
Reviewed-on: https://gerrit.libreoffice.org/56200
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc/dpobject.hxx')
-rw-r--r-- | sc/inc/dpobject.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 2e02ac88eed8..ee2efd74f00c 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -81,17 +81,17 @@ class SC_DLLPUBLIC ScDPObject private: ScDocument* pDoc; // settings - ScDPSaveData* pSaveData; + std::unique_ptr<ScDPSaveData> pSaveData; OUString aTableName; OUString aTableTag; ScRange aOutRange; - ScSheetSourceDesc* pSheetDesc; // for sheet data - ScImportSourceDesc* pImpDesc; // for database data - ScDPServiceDesc* pServDesc; // for external service + std::unique_ptr<ScSheetSourceDesc> pSheetDesc; // for sheet data + std::unique_ptr<ScImportSourceDesc> pImpDesc; // for database data + std::unique_ptr<ScDPServiceDesc> pServDesc; // for external service std::shared_ptr<ScDPTableData> mpTableData; // cached data css::uno::Reference<css::sheet::XDimensionsSupplier> xSource; - ScDPOutput* pOutput; + std::unique_ptr<ScDPOutput> pOutput; long nHeaderRows; // page fields plus filter button bool mbHeaderLayout:1; // true : grid, false : standard bool bAllowMove:1; @@ -129,7 +129,7 @@ public: ScRange GetOutputRangeByType( sal_Int32 nType ) const; void SetSaveData(const ScDPSaveData& rData); - ScDPSaveData* GetSaveData() const { return pSaveData; } + ScDPSaveData* GetSaveData() const { return pSaveData.get(); } void SetOutRange(const ScRange& rRange); const ScRange& GetOutRange() const; @@ -144,9 +144,9 @@ public: void WriteSourceDataTo( ScDPObject& rDest ) const; void WriteTempDataTo( ScDPObject& rDest ) const; - const ScSheetSourceDesc* GetSheetDesc() const { return pSheetDesc; } - const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; } - const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc; } + const ScSheetSourceDesc* GetSheetDesc() const { return pSheetDesc.get(); } + const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc.get(); } + const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc.get(); } css::uno::Reference<css::sheet::XDimensionsSupplier> const & GetSource(); |