summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj/nameuno.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-03-23 15:57:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-28 08:39:21 +0200
commitb2e8bbeafa35c15d168961de711e4970eb0985cb (patch)
tree1d8259893caa4ff0c74a0e271c641c4f326ea8e2 /sc/source/ui/unoobj/nameuno.cxx
parentc4170e4bcba61865425d03a1292b9aea39dc1e6d (diff)
loplugin:useuniqueptr in ScColumn
Change-Id: Iff6c68a29b9e7660132cbe4e556802b0f63706f0 Reviewed-on: https://gerrit.libreoffice.org/51904 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/unoobj/nameuno.cxx')
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index e1e7d1478c28..5e5ad772c0fe 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -169,7 +169,7 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray*
if (!pOld)
return;
- ScRangeName* pNewRanges = new ScRangeName(*pNames);
+ std::unique_ptr<ScRangeName> pNewRanges(new ScRangeName(*pNames));
OUString aInsName = pOld->GetName();
if (pNewName)
@@ -199,14 +199,13 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray*
pNewRanges->erase(*pOld);
if (pNewRanges->insert(pNew))
{
- pDocShell->GetDocFunc().SetNewRangeNames(pNewRanges, mxParent->IsModifyAndBroadcast(), nTab);
+ pDocShell->GetDocFunc().SetNewRangeNames(std::move(pNewRanges), mxParent->IsModifyAndBroadcast(), nTab);
aName = aInsName; //! broadcast?
}
else
{
pNew = nullptr; //! uno::Exception/Error or something
- delete pNewRanges;
}
}
@@ -492,19 +491,18 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName,
ScRangeName* pNames = GetRangeName_Impl();
if (pNames && !pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)))
{
- ScRangeName* pNewRanges = new ScRangeName( *pNames );
+ std::unique_ptr<ScRangeName> pNewRanges(new ScRangeName( *pNames ));
// GRAM_API for API compatibility.
ScRangeData* pNew = new ScRangeData( &rDoc, aName, aContent,
aPos, nNewType,formula::FormulaGrammar::GRAM_API );
if ( pNewRanges->insert(pNew) )
{
- pDocShell->GetDocFunc().SetNewRangeNames(pNewRanges, mbModifyAndBroadcast, GetTab_Impl());
+ pDocShell->GetDocFunc().SetNewRangeNames(std::move(pNewRanges), mbModifyAndBroadcast, GetTab_Impl());
bDone = true;
}
else
{
pNew = nullptr;
- delete pNewRanges;
}
}
}
@@ -549,9 +547,9 @@ void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName )
const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
if (pData && lcl_UserVisibleName(*pData))
{
- ScRangeName* pNewRanges = new ScRangeName(*pNames);
+ std::unique_ptr<ScRangeName> pNewRanges(new ScRangeName(*pNames));
pNewRanges->erase(*pData);
- pDocShell->GetDocFunc().SetNewRangeNames( pNewRanges, mbModifyAndBroadcast, GetTab_Impl());
+ pDocShell->GetDocFunc().SetNewRangeNames( std::move(pNewRanges), mbModifyAndBroadcast, GetTab_Impl());
bDone = true;
}
}