diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 14:38:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 15:09:46 +0100 |
| commit | dcae0b482ca78fc9cd6f8523f53aad8c8b486b0f (patch) | |
| tree | f92e13c92deed89532d65e7d9a6c008414c0483e /sw/source | |
| parent | 133ad42956ff38fe94020cd9aab316c9dfceff60 (diff) | |
update to new naming and casting
Change-Id: I389efc2f45f3110932318882faea82ab8565f89a
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/CntntIdxStore.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 187f0f4a2513..48983d8b7597 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -187,9 +187,8 @@ 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, sal_uLong nNode, sal_Int32 nCntnt, - const SwPaM& rPam, - bool bChkSelDirection ) + static void lcl_ChkUnoCrsrPaM( std::vector<PaMEntry>& rMarkEntries, const sal_uLong nNode, const sal_Int32 nContent, + SwPaM& rPam, bool bChkSelDirection ) { // Respect direction of selection bool bBound1IsStart = !bChkSelDirection || @@ -199,20 +198,20 @@ namespace const SwPosition* pPos = &rPam.GetBound( true ); if( pPos->nNode.GetIndex() == nNode && - ( bBound1IsStart ? pPos->nContent.GetIndex() < nCntnt - : pPos->nContent.GetIndex() <= nCntnt )) + ( bBound1IsStart ? pPos->nContent.GetIndex() < nContent + : pPos->nContent.GetIndex() <= nContent )) { - const PaMEntry aEntry = { const_cast<SwPaM*>(&rPam), false, pPos->nContent.GetIndex() }; + const PaMEntry aEntry = { &rPam, false, pPos->nContent.GetIndex() }; rMarkEntries.push_back(aEntry); } pPos = &rPam.GetBound( false ); if( pPos->nNode.GetIndex() == nNode && ( (bBound1IsStart && bChkSelDirection) - ? pPos->nContent.GetIndex() <= nCntnt - : pPos->nContent.GetIndex() < nCntnt )) + ? pPos->nContent.GetIndex() <= nContent + : pPos->nContent.GetIndex() < nContent )) { - const PaMEntry aEntry = { const_cast<SwPaM*>(&rPam), true, pPos->nContent.GetIndex() }; + const PaMEntry aEntry = { &rPam, true, pPos->nContent.GetIndex() }; rMarkEntries.push_back(aEntry); } } |