diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-29 14:47:34 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-29 17:59:36 +0200 |
commit | eb9a76c697b72cf0c31d1467a862c03d08760628 (patch) | |
tree | 452658982d4f235de0e9c1288fc4fff7afff9cac /sw/source/filter/basflt | |
parent | b91d4cf7ec844cc638dd8e02cc20e02d8f96998b (diff) |
use more SwPosition::Assign
part of hiding the internals of SwPosition
Change-Id: I9a0e393e755c8cb6a1b9857ecf0abbabf61a2840
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138996
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/basflt')
-rw-r--r-- | sw/source/filter/basflt/fltshell.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 2c12e23c338d..75ef5d5c36b4 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -470,15 +470,15 @@ static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc& rDoc, // out: start of valid range // rTmpEnd is an out parameter // Returns true for valid range -static bool IterateNumrulePiece( const SwNodeIndex& rEnd, +static bool IterateNumrulePiece( const SwPosition& rEnd, SwNodeIndex& rTmpStart, SwNodeIndex& rTmpEnd ) { - while( ( rTmpStart <= rEnd ) + while( ( rTmpStart <= rEnd.GetNode() ) && !( rTmpStart.GetNode().IsTextNode() ) ) // look for valid start ++rTmpStart; rTmpEnd = rTmpStart; - while( ( rTmpEnd <= rEnd ) + while( ( rTmpEnd <= rEnd.GetNode() ) && ( rTmpEnd.GetNode().IsTextNode() ) ) // look for valid end + 1 ++rTmpEnd; @@ -532,7 +532,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, { SwNodeIndex aTmpStart( aRegion.Start()->GetNode() ); SwNodeIndex aTmpEnd( aTmpStart ); - SwNodeIndex& rRegEndNd = aRegion.End()->nNode; + SwPosition& rRegEndNd = *aRegion.End(); while( IterateNumrulePiece( rRegEndNd, aTmpStart, aTmpEnd ) ) { |