diff options
Diffstat (limited to 'sw/source/core/doc/CntntIdxStore.cxx')
| -rw-r--r-- | sw/source/core/doc/CntntIdxStore.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 9e54fe4610ad..58de4967a42d 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -57,7 +57,7 @@ namespace int nReturn = BEFORE_NODE; if( nIndex == nNode ) { - const sal_Int32 nCntIdx = rPos.nContent.GetIndex(); + const sal_Int32 nCntIdx = rPos.GetContentIndex(); if( nCntIdx < nContent ) nReturn = BEFORE_SAME_NODE; else if( nCntIdx == nContent ) @@ -201,9 +201,9 @@ namespace void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const SwNodeOffset nNode, const sal_Int32 nContent, SwPaM& rPaM, const bool bGetPoint, bool bSetMark) { const SwPosition* pPos = &rPaM.GetBound(bGetPoint); - if( pPos->GetNodeIndex() == nNode && pPos->nContent.GetIndex() < nContent ) + if( pPos->GetNodeIndex() == nNode && pPos->GetContentIndex() < nContent ) { - const PaMEntry aEntry = { &rPaM, bSetMark, pPos->nContent.GetIndex() }; + const PaMEntry aEntry = { &rPaM, bSetMark, pPos->GetContentIndex() }; rPaMEntries.push_back(aEntry); } } @@ -239,11 +239,11 @@ void ContentIdxStoreImpl::SaveBkmks(SwDoc& rDoc, SwNodeOffset nNode, sal_Int32 n const ::sw::mark::IMark* pBkmk = *ppBkmk; bool bMarkPosEqual = false; if(pBkmk->GetMarkPos().GetNodeIndex() == nNode - && pBkmk->GetMarkPos().nContent.GetIndex() <= nContent) + && pBkmk->GetMarkPos().GetContentIndex() <= nContent) { - if(pBkmk->GetMarkPos().nContent.GetIndex() < nContent) + if(pBkmk->GetMarkPos().GetContentIndex() < nContent) { - const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk - pMarkAccess->getAllMarksBegin()), false, pBkmk->GetMarkPos().nContent.GetIndex() }; + const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk - pMarkAccess->getAllMarksBegin()), false, pBkmk->GetMarkPos().GetContentIndex() }; m_aBkmkEntries.push_back(aEntry); } else // if a bookmark position is equal nContent, the other position @@ -251,14 +251,14 @@ void ContentIdxStoreImpl::SaveBkmks(SwDoc& rDoc, SwNodeOffset nNode, sal_Int32 n } if(pBkmk->IsExpanded() && pBkmk->GetOtherMarkPos().GetNodeIndex() == nNode - && pBkmk->GetOtherMarkPos().nContent.GetIndex() <= nContent) + && pBkmk->GetOtherMarkPos().GetContentIndex() <= nContent) { if(bMarkPosEqual) { // the other position is before, the (main) position is equal - const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk - pMarkAccess->getAllMarksBegin()), false, pBkmk->GetMarkPos().nContent.GetIndex() }; + const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk - pMarkAccess->getAllMarksBegin()), false, pBkmk->GetMarkPos().GetContentIndex() }; m_aBkmkEntries.push_back(aEntry); } - const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk - pMarkAccess->getAllMarksBegin()), true, pBkmk->GetOtherMarkPos().nContent.GetIndex() }; + const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk - pMarkAccess->getAllMarksBegin()), true, pBkmk->GetOtherMarkPos().GetContentIndex() }; m_aBkmkEntries.push_back(aEntry); } } @@ -298,13 +298,13 @@ void ContentIdxStoreImpl::SaveRedlines(SwDoc& rDoc, SwNodeOffset nNode, sal_Int3 if( nPointPos == BEFORE_SAME_NODE || ( nPointPos == SAME_POSITION && nMarkPos < SAME_POSITION ) ) { - const MarkEntry aEntry = { nIdx, false, pRdl->GetPoint()->nContent.GetIndex() }; + const MarkEntry aEntry = { nIdx, false, pRdl->GetPoint()->GetContentIndex() }; m_aRedlineEntries.push_back(aEntry); } if( pRdl->HasMark() && ( nMarkPos == BEFORE_SAME_NODE || ( nMarkPos == SAME_POSITION && nPointPos < SAME_POSITION ) ) ) { - const MarkEntry aEntry = { nIdx, true, pRdl->GetMark()->nContent.GetIndex() }; + const MarkEntry aEntry = { nIdx, true, pRdl->GetMark()->GetContentIndex() }; m_aRedlineEntries.push_back(aEntry); } ++nIdx; @@ -350,7 +350,7 @@ void ContentIdxStoreImpl::SaveFlys(SwDoc& rDoc, SwNodeOffset nNode, sal_Int32 nC { bool bSkip = false; aSave.m_bOther = false; - aSave.m_nContent = pAPos->nContent.GetIndex(); + aSave.m_nContent = pAPos->GetContentIndex(); if ( RndStdIds::FLY_AT_CHAR == rAnchor.GetAnchorId() ) { if( nContent <= aSave.m_nContent ) |