diff options
Diffstat (limited to 'sw/source/core/doc/doccomp.cxx')
| -rw-r--r-- | sw/source/core/doc/doccomp.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index e46f0d9aa5f7..4d40ae43ae33 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1643,7 +1643,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo ) if( pTmp ) { - SwRedlineData aRedlnData( nsRedlineType_t::REDLINE_DELETE, nAuthor, aTimeStamp, + SwRedlineData aRedlnData( RedlineType::Delete, nAuthor, aTimeStamp, OUString(), nullptr ); do { // #i65201#: Expand again, see comment above. @@ -1674,7 +1674,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo ) } } - rDoc.getIDocumentRedlineAccess().DeleteRedline( *pTmp, false, USHRT_MAX ); + rDoc.getIDocumentRedlineAccess().DeleteRedline( *pTmp, false, RedlineType::Any ); if (rDoc.GetIDocumentUndoRedo().DoesUndo()) { @@ -1717,7 +1717,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo ) } } } while( pInsRing.get() != ( pTmp = pTmp->GetNext()) ); - SwRedlineData aRedlnData( nsRedlineType_t::REDLINE_INSERT, nAuthor, aTimeStamp, + SwRedlineData aRedlnData( RedlineType::Insert, nAuthor, aTimeStamp, OUString(), nullptr ); // combine consecutive @@ -1903,7 +1903,7 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd, aPos.nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(&rDstNd)), pStt->nContent.GetIndex() ); pDestRedl = new SwRangeRedline( rSrcRedl.GetRedlineData(), aPos ); - if( nsRedlineType_t::REDLINE_DELETE == pDestRedl->GetType() ) + if( RedlineType::Delete == pDestRedl->GetType() ) { // mark the area as deleted const SwPosition* pEnd = pStt == rSrcRedl.GetPoint() @@ -1923,7 +1923,7 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline) sal_uInt16 nIns = 0; SwDoc* pDoc = pDestRedl->GetDoc(); - if( nsRedlineType_t::REDLINE_INSERT == pDestRedl->GetType() ) + if( RedlineType::Insert == pDestRedl->GetType() ) { // the part was inserted so copy it from the SourceDoc ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); @@ -1968,8 +1968,8 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline) SwPosition* pRStt = pRedl->Start(), * pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark() : pRedl->GetPoint(); - if( nsRedlineType_t::REDLINE_DELETE == pRedl->GetType() || - nsRedlineType_t::REDLINE_INSERT == pRedl->GetType() ) + if( RedlineType::Delete == pRedl->GetType() || + RedlineType::Insert == pRedl->GetType() ) { SwComparePosition eCmpPos = ComparePosition( *pDStt, *pDEnd, *pRStt, *pREnd ); switch( eCmpPos ) @@ -2087,9 +2087,9 @@ long SwDoc::MergeDoc( const SwDoc& rDoc ) for(const SwRangeRedline* pRedl : rSrcRedlTable) { sal_uLong nNd = pRedl->GetPoint()->nNode.GetIndex(); - RedlineType_t eType = pRedl->GetType(); + RedlineType eType = pRedl->GetType(); if( nEndOfExtra < nNd && - ( nsRedlineType_t::REDLINE_INSERT == eType || nsRedlineType_t::REDLINE_DELETE == eType )) + ( RedlineType::Insert == eType || RedlineType::Delete == eType )) { const SwNode* pDstNd = GetNodes()[ nMyEndOfExtra + nNd - nEndOfExtra ]; |