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/dbdocimp.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/dbdocimp.cxx')
-rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index b7362c0966b0..df9b96129c2f 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -467,13 +467,13 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, SCROW nUndoEndRow = std::max( nEndRow, rParam.nRow2 ); ScDocumentUniquePtr pUndoDoc; - ScDBData* pUndoDBData = nullptr; + std::unique_ptr<ScDBData> pUndoDBData; if ( bRecord ) { pUndoDoc.reset(new ScDocument( SCDOCMODE_UNDO )); pUndoDoc->InitUndo( &rDoc, nTab, nTab ); - pUndoDBData = new ScDBData( *pDBData ); + pUndoDBData.reset(new ScDBData( *pDBData )); } ScMarkData aNewMark; @@ -581,13 +581,14 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nEndCol+nFormulaCols, nEndRow, nTab, InsertDeleteFlags::ALL & ~InsertDeleteFlags::NOTE, false, *pRedoDoc); - ScDBData* pRedoDBData = pDBData ? new ScDBData( *pDBData ) : nullptr; + std::unique_ptr<ScDBData> pRedoDBData(pDBData ? new ScDBData( *pDBData ) : nullptr); rDocShell.GetUndoManager()->AddUndoAction( new ScUndoImportData( &rDocShell, nTab, rParam, nUndoEndCol, nUndoEndRow, nFormulaCols, - std::move(pUndoDoc), std::move(pRedoDoc), pUndoDBData, pRedoDBData ) ); + std::move(pUndoDoc), std::move(pRedoDoc), + std::move(pUndoDBData), std::move(pRedoDBData) ) ); } sc::SetFormulaDirtyContext aCxt; |