diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-19 15:32:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-19 15:49:33 +0100 |
| commit | e8baf2d2f1d3eaa6fadbda0ff3ef798a497bbdec (patch) | |
| tree | 8660817c813e819fe26ba06567b8a659b384b54a | |
| parent | e9834a3eaf35a2c7b61cf45c2d64e9f3bbe89982 (diff) | |
coverity#1371270 Missing move assignment operator
Change-Id: I9a5656fa3a4d4283a1daec957da9d909390d9eb2
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/frmcrsr.cxx | 7 | ||||
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index f12fd3b0e7cd..7cd5c762a33a 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -4516,7 +4516,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, { assert(*pCopyPam->GetPoint() == rPos); // the Node rPos points to may be deleted so unregister ... - rPos.nContent = SwIndex(nullptr); + rPos.nContent.Assign(nullptr, 0); lcl_DeleteRedlines(rPam, *pCopyPam); rPos = *pCopyPam->GetPoint(); // ... and restore. } diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index d2c4a892864c..130c710b3dec 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -689,7 +689,7 @@ bool SwTextFrame::LeftMargin(SwPaM *pPam) const nIndx = 0; } } - pPam->GetPoint()->nContent = SwIndex( pFrame->GetTextNode(), nIndx ); + pPam->GetPoint()->nContent.Assign(pFrame->GetTextNode(), nIndx); SwTextCursor::SetRightMargin( false ); return true; } @@ -730,7 +730,7 @@ bool SwTextFrame::RightMargin(SwPaM *pPam, bool bAPI) const --nRightMargin; } } - pPam->GetPoint()->nContent = SwIndex( pFrame->GetTextNode(), nRightMargin ); + pPam->GetPoint()->nContent.Assign(pFrame->GetTextNode(), nRightMargin); SwTextCursor::SetRightMargin( !bAPI ); return true; } @@ -839,8 +839,7 @@ bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips nOffset, nTmpOfst = nStart; aSet.SetRight( true ); } - pPam->GetPoint()->nContent = - SwIndex( const_cast<SwTextFrame*>(this)->GetTextNode(), nTmpOfst ); + pPam->GetPoint()->nContent.Assign(const_cast<SwTextFrame*>(this)->GetTextNode(), nTmpOfst); return true; } diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 392dae930339..c0cf47dda25d 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -2769,7 +2769,7 @@ SwUndo* SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox } } else - aInsertEnd.nContent = SwIndex( nullptr ); + aInsertEnd.nContent.Assign(nullptr, 0); } // For joined (merged) contents the start of deletion and end of insertion are identical // otherwise adjacent nodes. |