diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 14:49:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 15:09:46 +0100 |
| commit | a3094a1f898b9efb765fe822fc507d3be4369361 (patch) | |
| tree | ae8acbf8b9a3349d01fa307e6670df74f8eb1497 | |
| parent | 12d9292cd948dbf78bdcab4a46694563b3cce3cf (diff) | |
rename lcl_ChkUnoCrsrPaM and split it up to be like lcl_ChkPaM[Both]
Change-Id: I8850031da3901fb3d828c3af20f98ca741fc2a4a
| -rw-r--r-- | sw/source/core/doc/CntntIdxStore.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index f4d24356e42b..82de6b39cc8b 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -187,22 +187,20 @@ namespace static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos) { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); }; }; - static void lcl_ChkUnoCrsrPaM(std::vector<PaMEntry>& rMarkEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPam) + static void lcl_ChkUnoCrsrPaM(std::vector<PaMEntry>& rPamEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM, bool bPoint) { - const SwPosition* pPos = &rPam.GetBound( true ); + const SwPosition* pPos = &rPaM.GetBound(bPoint); if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nContent ) { - const PaMEntry aEntry = { &rPam, false, pPos->nContent.GetIndex() }; - rMarkEntries.push_back(aEntry); - } - - pPos = &rPam.GetBound( false ); - if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nContent ) - { - const PaMEntry aEntry = { &rPam, true, pPos->nContent.GetIndex() }; - rMarkEntries.push_back(aEntry); + const PaMEntry aEntry = { &rPaM, !bPoint, pPos->nContent.GetIndex() }; + rPamEntries.push_back(aEntry); } } + static void lcl_ChkUnoCrsrPaMBoth(std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM) + { + lcl_ChkUnoCrsrPaM(rPaMEntries, nNode, nContent, rPaM, true); + lcl_ChkUnoCrsrPaM(rPaMEntries, nNode, nContent, rPaM, false); + } inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM, const bool bPoint) { const SwPosition* pPos = &rPaM.GetBound( bPoint ); @@ -402,14 +400,14 @@ void ContentIdxStoreImpl::SaveUnoCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int32 continue; for(SwPaM& rPaM : pUnoCursor.get()->GetRingContainer()) { - lcl_ChkUnoCrsrPaM(m_aUnoCursorEntries, nNode, nContent, rPaM); + lcl_ChkUnoCrsrPaMBoth(m_aUnoCursorEntries, nNode, nContent, rPaM); } const SwUnoTableCursor* pUnoTableCursor = dynamic_cast<const SwUnoTableCursor*>(pUnoCursor.get()); if( pUnoTableCursor ) { for(SwPaM& rPaM : (&(const_cast<SwUnoTableCursor*>(pUnoTableCursor))->GetSelRing())->GetRingContainer()) { - lcl_ChkUnoCrsrPaM(m_aUnoCursorEntries, nNode, nContent, rPaM); + lcl_ChkUnoCrsrPaMBoth(m_aUnoCursorEntries, nNode, nContent, rPaM); } } } |