diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-29 10:21:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-29 10:47:08 +0100 |
| commit | 5e4d88a27802848ae23874a81592c2a6758d77e1 (patch) | |
| tree | 8c96909d974988c5be0da730a0b02d6b2d87e69c /sc/inc | |
| parent | e7bd86b399e549ef51397e3ae46947d78852e9cc (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/inc')
| -rw-r--r-- | sc/inc/conditio.hxx | 4 | ||||
| -rw-r--r-- | sc/inc/document.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/table.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 3b0480e64d6d..36703a7d2017 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -543,7 +543,7 @@ public: const ScConditionalFormat& operator=(const ScConditionalFormat&) = delete; // true copy of formulas (for Ref-Undo / between documents) - ScConditionalFormat* Clone(ScDocument* pNewDoc = nullptr) const; + std::unique_ptr<ScConditionalFormat> Clone(ScDocument* pNewDoc = nullptr) const; void AddEntry( ScFormatEntry* pNew ); void RemoveEntry(size_t nIndex); @@ -610,7 +610,7 @@ public: ScConditionalFormatList(const ScConditionalFormatList& rList); ScConditionalFormatList(ScDocument* pDoc, const ScConditionalFormatList& rList); - void InsertNew( ScConditionalFormat* pNew ); + void InsertNew( std::unique_ptr<ScConditionalFormat> pNew ); /** * Checks that all cond formats have a non empty range. diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 4e19792f2a2e..bed8003de16c 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1719,7 +1719,7 @@ public: void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ); void ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ); - SC_DLLPUBLIC sal_uLong AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab ); + SC_DLLPUBLIC sal_uLong AddCondFormat( std::unique_ptr<ScConditionalFormat> pNew, SCTAB nTab ); void DeleteConditionalFormat( sal_uLong nIndex, SCTAB nTab ); void SetCondFormList( ScConditionalFormatList* pList, SCTAB nTab ); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index d853c4072de1..38ea573ba120 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -979,7 +979,7 @@ public: void DeleteConditionalFormat(sal_uLong nOldIndex); - sal_uLong AddCondFormat( ScConditionalFormat* pNew ); + sal_uLong AddCondFormat( std::unique_ptr<ScConditionalFormat> pNew ); SvtScriptType GetScriptType( SCCOL nCol, SCROW nRow ) const; void SetScriptType( SCCOL nCol, SCROW nRow, SvtScriptType nType ); |