From bf64b723878d793980a025e624119bc5c39268d6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 9 Jan 2019 12:00:37 +0200 Subject: use unique_ptr in ScViewOptions::CreateGridItem Change-Id: I350e606b14a5a7f269fecca1d176f40c4343c344 Reviewed-on: https://gerrit.libreoffice.org/66005 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/inc/viewopti.hxx | 2 +- sc/source/core/tool/viewopti.cxx | 4 ++-- sc/source/ui/app/scmod.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sc') diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index a0660acdf4b2..e768b1ba4a8a 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -94,7 +94,7 @@ public: const ScGridOptions& GetGridOptions() const { return aGridOpt; } void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } - SvxGridItem* CreateGridItem() const; + std::unique_ptr CreateGridItem() const; ScViewOptions& operator= ( const ScViewOptions& rCpy ); bool operator== ( const ScViewOptions& rOpt ) const; diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index d3662d744650..58262ae65ba8 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -156,9 +156,9 @@ bool ScViewOptions::operator==( const ScViewOptions& rOpt ) const return bEqual; } -SvxGridItem* ScViewOptions::CreateGridItem() const +std::unique_ptr ScViewOptions::CreateGridItem() const { - SvxGridItem* pItem = new SvxGridItem( SID_ATTR_GRID_OPTIONS ); + std::unique_ptr pItem(new SvxGridItem( SID_ATTR_GRID_OPTIONS )); pItem->SetFieldDrawX ( aGridOpt.GetFieldDrawX() ); pItem->SetFieldDivisionX ( aGridOpt.GetFieldDivisionX() ); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 632f61e4dda9..d7804043b22c 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1965,9 +1965,9 @@ std::unique_ptr ScModule::CreateItemSet( sal_uInt16 nId ) pRet->Put( ScTpPrintItem( GetPrintOptions() ) ); // TP_GRID - SvxGridItem* pSvxGridItem = aViewOpt.CreateGridItem(); + std::unique_ptr pSvxGridItem = aViewOpt.CreateGridItem(); pRet->Put( *pSvxGridItem ); - delete pSvxGridItem; + pSvxGridItem.reset(); // TP_USERLISTS if ( pUL ) -- cgit