diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-05 11:31:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-05 21:24:03 +0200 |
| commit | 7f94c09b8bad0d8d31e126a95ede4fa937a8981a (patch) | |
| tree | a28ecefe06a21671d1f7eddb8895c6fce4428286 /sw/source/core/undo | |
| parent | df5c984fa2e1687603e9e1b63a69b43591f19143 (diff) | |
SwUndoTableMerge::MoveBoxContent always dereferences its SwDoc* arg
Change-Id: I38472e475c6cb7f96b414d107301a04bbb73c0fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103958
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/undo')
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 0df50f847820..59f4a0e3cff8 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -2002,12 +2002,12 @@ void SwUndoTableMerge::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.MergeTable(rPam); } -void SwUndoTableMerge::MoveBoxContent( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos ) +void SwUndoTableMerge::MoveBoxContent( SwDoc& rDoc, SwNodeRange& rRg, SwNodeIndex& rPos ) { SwNodeIndex aTmp( rRg.aStart, -1 ), aTmp2( rPos, -1 ); - std::unique_ptr<SwUndoMove> pUndo(new SwUndoMove( pDoc, rRg, rPos )); - ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); - pDoc->getIDocumentContentOperations().MoveNodeRange( rRg, rPos, m_pSaveTable->IsNewModel() ? + std::unique_ptr<SwUndoMove> pUndo(new SwUndoMove( &rDoc, rRg, rPos )); + ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo()); + rDoc.getIDocumentContentOperations().MoveNodeRange( rRg, rPos, m_pSaveTable->IsNewModel() ? SwMoveFlags::NO_DELFRMS : SwMoveFlags::DEFAULT ); ++aTmp; |