diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-30 11:26:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-31 08:23:20 +0200 |
| commit | df26410a52419707590fdf62dc043d13b79ada81 (patch) | |
| tree | 16311130812a2997f3e9328e356c8222e5e2def2 /sc/source/ui/docshell/docsh5.cxx | |
| parent | 418e6419219a7ffa61b7400abbbcec6a6a93b91f (diff) | |
pass ScDBData by std::unique_ptr
Change-Id: Ia16bde5b428be6a39ff7e3f6052258652ea0f07a
Reviewed-on: https://gerrit.libreoffice.org/59789
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/docshell/docsh5.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 95106e21676f..58a9ead66043 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -560,7 +560,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, bool bRecord ) aData.GetSize( nColSize, nRowSize ); if (bRecord && nColSize > 0 && nRowSize > 0) { - ScDBData* pUndoData = pDestData ? new ScDBData(*pDestData) : nullptr; + std::unique_ptr<ScDBData> pUndoData(pDestData ? new ScDBData(*pDestData) : nullptr); SCTAB nDestTab = rParam.nTab; ScArea aDestArea( rParam.nTab, rParam.nCol, rParam.nRow, @@ -575,7 +575,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, bool bRecord ) // old outlines ScOutlineTable* pTable = m_aDocument.GetOutlineTable( nDestTab ); - ScOutlineTable* pUndoTab = pTable ? new ScOutlineTable( *pTable ) : nullptr; + std::unique_ptr<ScOutlineTable> pUndoTab(pTable ? new ScOutlineTable( *pTable ) : nullptr); ScDocumentUniquePtr pUndoDoc(new ScDocument( SCDOCMODE_UNDO )); pUndoDoc->InitUndo( &m_aDocument, 0, nTabCount-1, false, true ); @@ -599,7 +599,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, bool bRecord ) GetUndoManager()->AddUndoAction( new ScUndoConsolidate( this, aDestArea, rParam, std::move(pUndoDoc), - true, nInsertCount, pUndoTab, pUndoData ) ); + true, nInsertCount, std::move(pUndoTab), std::move(pUndoData) ) ); } else { @@ -616,7 +616,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, bool bRecord ) GetUndoManager()->AddUndoAction( new ScUndoConsolidate( this, aDestArea, rParam, std::move(pUndoDoc), - false, 0, nullptr, pUndoData ) ); + false, 0, nullptr, std::move(pUndoData) ) ); } } |