summaryrefslogtreecommitdiff
path: root/sc/source/core/data/conditio.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-01-29 10:21:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-29 10:47:08 +0100
commit5e4d88a27802848ae23874a81592c2a6758d77e1 (patch)
tree8c96909d974988c5be0da730a0b02d6b2d87e69c /sc/source/core/data/conditio.cxx
parente7bd86b399e549ef51397e3ae46947d78852e9cc (diff)
pass ScConditionalFormat around by unique_ptr
Change-Id: If15ac08d8334a386312870d3ebebb385cf55e5f6 Reviewed-on: https://gerrit.libreoffice.org/67050 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/core/data/conditio.cxx')
-rw-r--r--sc/source/core/data/conditio.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index e4c669052467..d5bb968d5d50 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1702,20 +1702,20 @@ ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocume
{
}
-ScConditionalFormat* ScConditionalFormat::Clone(ScDocument* pNewDoc) const
+std::unique_ptr<ScConditionalFormat> ScConditionalFormat::Clone(ScDocument* pNewDoc) const
{
// Real copy of the formula (for Ref Undo/between documents)
if (!pNewDoc)
pNewDoc = pDoc;
- ScConditionalFormat* pNew = new ScConditionalFormat(nKey, pNewDoc);
+ std::unique_ptr<ScConditionalFormat> pNew(new ScConditionalFormat(nKey, pNewDoc));
pNew->SetRange( maRanges ); // prerequisite for listeners
for (auto itr = maEntries.cbegin(); itr != maEntries.cend(); ++itr)
{
ScFormatEntry* pNewEntry = (*itr)->Clone(pNewDoc);
pNew->maEntries.push_back( std::unique_ptr<ScFormatEntry>(pNewEntry) );
- pNewEntry->SetParent(pNew);
+ pNewEntry->SetParent(pNew.get());
}
return pNew;
@@ -2045,9 +2045,9 @@ ScConditionalFormatList::ScConditionalFormatList(ScDocument* pDoc, const ScCondi
InsertNew( (*itr)->Clone(pDoc) );
}
-void ScConditionalFormatList::InsertNew( ScConditionalFormat* pNew )
+void ScConditionalFormatList::InsertNew( std::unique_ptr<ScConditionalFormat> pNew )
{
- m_ConditionalFormats.insert(std::unique_ptr<ScConditionalFormat>(pNew));
+ m_ConditionalFormats.insert(std::move(pNew));
}
ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey )