diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-27 10:11:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-28 10:12:57 +0200 |
| commit | b7239a1271d5af51163b4fcd93608b72db2616a4 (patch) | |
| tree | c5e6a6f0fd26b5219a1e9c32809984946833edfd /sc/source/ui/view/dbfunc3.cxx | |
| parent | 8bcc4a98d78869d6839821b9747602777f00ebaf (diff) | |
loplugin:useuniqueptr pass ScDocument by unique_ptr in undo code
Change-Id: Ib05638865a42ad37c3382714e1790c7035ed8ebf
Reviewed-on: https://gerrit.libreoffice.org/59638
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/view/dbfunc3.cxx')
| -rw-r--r-- | sc/source/ui/view/dbfunc3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index b00359412132..57608b8bb091 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -437,7 +437,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, ScDocShellModificator aModificator( *pDocSh ); ScSubTotalParam aNewParam( rParam ); // change end of range - ScDocument* pUndoDoc = nullptr; + ScDocumentUniquePtr pUndoDoc; std::unique_ptr<ScOutlineTable> pUndoTab; ScRangeName* pUndoRange = nullptr; ScDBCollection* pUndoDB = nullptr; @@ -446,7 +446,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, { bool bOldFilter = bDo && rParam.bDoSort; SCTAB nTabCount = rDoc.GetTableCount(); - pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); + pUndoDoc.reset(new ScDocument( SCDOCMODE_UNDO )); ScOutlineTable* pTable = rDoc.GetOutlineTable( nTab ); if (pTable) { @@ -526,7 +526,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, pDocSh->GetUndoManager()->AddUndoAction( new ScUndoSubTotals( pDocSh, nTab, rParam, aNewParam.nRow2, - pUndoDoc, std::move(pUndoTab), // pUndoDBData, + std::move(pUndoDoc), std::move(pUndoTab), // pUndoDBData, pUndoRange, pUndoDB ) ); } @@ -2130,7 +2130,7 @@ void ScDBFunc::RepeatDB( bool bRecord ) //! undo only needed data ? - ScDocument* pUndoDoc = nullptr; + ScDocumentUniquePtr pUndoDoc; ScOutlineTable* pUndoTab = nullptr; ScRangeName* pUndoRange = nullptr; ScDBCollection* pUndoDB = nullptr; @@ -2138,7 +2138,7 @@ void ScDBFunc::RepeatDB( bool bRecord ) if (bRecord) { SCTAB nTabCount = pDoc->GetTableCount(); - pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); + pUndoDoc.reset(new ScDocument( SCDOCMODE_UNDO )); ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); if (pTable) { @@ -2235,7 +2235,7 @@ void ScDBFunc::RepeatDB( bool bRecord ) nStartCol, nStartRow, nEndCol, nEndRow, nNewEndRow, nCurX, nCurY, - pUndoDoc, pUndoTab, + std::move(pUndoDoc), pUndoTab, pUndoRange, pUndoDB, pOld, pNew ) ); } |