diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-06 02:18:45 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-08 14:52:14 +0100 |
| commit | 01896d465a885e42d66a33a4cc88e7b1021b1a54 (patch) | |
| tree | 9a3ec5cf3ab4ce11106fabdb57dcd14efd5a840b | |
| parent | 60912747087f37f919875677478dbad8165047c6 (diff) | |
make InsertRedline a static function
Change-Id: I80c7750f88f9b20e3a2be7306c53676d373654df
| -rw-r--r-- | sw/source/core/doc/doccomp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 077d4600f06f..937430ea746d 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1830,16 +1830,16 @@ long SwDoc::CompareDoc( const SwDoc& rDoc ) class _SaveMergeRedlines; class _SaveMergeRedlines : public sw::Ring<_SaveMergeRedlines> { +public: const SwRangeRedline* pSrcRedl; SwRangeRedline* pDestRedl; -public: _SaveMergeRedlines( const SwNode& rDstNd, const SwRangeRedline& rSrcRedl, _SaveMergeRedlines* pRing ); - sal_uInt16 InsertRedline(); _SaveMergeRedlines* GetNext() { return GetNextInRing(); } _SaveMergeRedlines* GetPrev() { return GetPrevInRing(); } + static sal_uInt16 InsertRedline(_SaveMergeRedlines* pRing, const SwRangeRedline* pSrcRedl, SwRangeRedline* pDestRedl); }; _SaveMergeRedlines::_SaveMergeRedlines( const SwNode& rDstNd, @@ -1868,7 +1868,7 @@ _SaveMergeRedlines::_SaveMergeRedlines( const SwNode& rDstNd, } } -sal_uInt16 _SaveMergeRedlines::InsertRedline() +sal_uInt16 _SaveMergeRedlines::InsertRedline(_SaveMergeRedlines* pRing, const SwRangeRedline* pSrcRedl, SwRangeRedline* pDestRedl) { sal_uInt16 nIns = 0; SwDoc* pDoc = pDestRedl->GetDoc(); @@ -1896,9 +1896,9 @@ sal_uInt16 _SaveMergeRedlines::InsertRedline() pDestRedl->GetMark()->nContent.Assign( aSaveNd.GetNode().GetCntntNode(), nSaveCnt ); - if( GetPrev() != this ) + if( !pRing->unique() ) { - SwPaM* pTmpPrev = static_cast<_SaveMergeRedlines*>(GetPrev())->pDestRedl; + SwPaM* pTmpPrev = static_cast<_SaveMergeRedlines*>(pRing->GetPrev())->pDestRedl; if( pTmpPrev && *pTmpPrev->GetPoint() == *pDestRedl->GetPoint() ) *pTmpPrev->GetPoint() = *pDestRedl->GetMark(); } @@ -2068,7 +2068,7 @@ long SwDoc::MergeDoc( const SwDoc& rDoc ) _SaveMergeRedlines* pTmp = pRing; do { - nRet += pTmp->InsertRedline(); + nRet += pTmp->InsertRedline(pTmp, pTmp->pSrcRedl, pTmp->pDestRedl); } while( pRing != ( pTmp = pTmp->GetNext()) ); while( pRing != pRing->GetNext() ) |