diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-19 15:37:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-19 15:49:33 +0100 |
| commit | af84c70c95e99935d2efdb98bc105d2a7852ebda (patch) | |
| tree | 0ee0b4a41389467656ea1558351fcaccd82410c4 | |
| parent | e8baf2d2f1d3eaa6fadbda0ff3ef798a497bbdec (diff) | |
coverity#1371301 Missing move assignment operator
Change-Id: Ibd6d4b52c24989af6872b4eb3c6c585c1e24a4db
| -rw-r--r-- | sw/source/core/crsr/swcrsr.cxx | 5 | ||||
| -rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 56dc9a0a88df..69de007de8d7 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1965,7 +1965,10 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt ) (!bNext && !aCellIdx.GetNode().IsEndNode()) ) return false; - rPtIdx = bNext ? aCellIdx : SwNodeIndex(*aCellIdx.GetNode().StartOfSectionNode()); + if (bNext) + rPtIdx = aCellIdx; + else + rPtIdx.Assign(*aCellIdx.GetNode().StartOfSectionNode()); pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode(); pTableBox = pTableBoxStartNode->GetTableBox(); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index e0518927ab0c..b0d05c36bfe4 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1420,7 +1420,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes, aCellNodeIdx.GetNode().m_pStartOfSection = pSttNd; //skip start/end node pairs if( aCellNodeIdx.GetNode().IsStartNode() ) - aCellNodeIdx = SwNodeIndex( *aCellNodeIdx.GetNode().EndOfSectionNode() ); + aCellNodeIdx.Assign(*aCellNodeIdx.GetNode().EndOfSectionNode()); } // assign Section to the Box diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 8ab388cc3a63..50c6e18c7444 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -833,7 +833,7 @@ sal_uInt8 SwNode::HasPrevNextLayNode() const if( IsValidNextPrevNd( aIdx.GetNode() )) nRet |= ND_HAS_PREV_LAYNODE; // #i77805# - skip section start and end nodes - aIdx = SwNodeIndex( *this, +1 ); + aIdx.Assign(*this, +1); while ( aIdx.GetNode().IsSectionNode() || ( aIdx.GetNode().IsEndNode() && aIdx.GetNode().StartOfSectionNode()->IsSectionNode() ) ) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 35320c4db4c9..f6add22360f6 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4569,7 +4569,7 @@ void wwSectionManager::InsertSegments() mrReader.m_rDoc.GetNodes().MakeTextNode(aAnchor, mrReader.m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT )); - aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTextNd); + aSectPaM.GetPoint()->nNode.Assign(*pTextNd); aSectPaM.GetPoint()->nContent.Assign( aSectPaM.GetContentNode(), 0); } |