diff options
Diffstat (limited to 'sw/source/core/access/parachangetrackinginfo.cxx')
| -rw-r--r-- | sw/source/core/access/parachangetrackinginfo.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index 3ab9b8a5d593..938d77975632 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -31,7 +31,7 @@ #include <algorithm> namespace { - void initChangeTrackTextMarkupLists( const SwTextFrm& rTextFrm, + void initChangeTrackTextMarkupLists( const SwTextFrame& rTextFrame, SwWrongList*& opChangeTrackInsertionTextMarkupList, SwWrongList*& opChangeTrackDeletionTextMarkupList, SwWrongList*& opChangeTrackFormatChangeTextMarkupList ) @@ -40,12 +40,12 @@ namespace { opChangeTrackDeletionTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING ); opChangeTrackFormatChangeTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING ); - if ( !rTextFrm.GetTextNode() ) + if ( !rTextFrame.GetTextNode() ) { OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTextNode> instance!" ); return; } - const SwTextNode& rTextNode( *(rTextFrm.GetTextNode()) ); + const SwTextNode& rTextNode( *(rTextFrame.GetTextNode()) ); const IDocumentRedlineAccess& rIDocChangeTrack( rTextNode.getIDocumentRedlineAccess() ); @@ -64,12 +64,12 @@ namespace { return; } - const sal_Int32 nTextFrmTextStartPos = rTextFrm.IsFollow() - ? rTextFrm.GetOfst() + const sal_Int32 nTextFrameTextStartPos = rTextFrame.IsFollow() + ? rTextFrame.GetOfst() : 0; - const sal_Int32 nTextFrmTextEndPos = rTextFrm.HasFollow() - ? rTextFrm.GetFollow()->GetOfst() - : rTextFrm.GetText().getLength(); + const sal_Int32 nTextFrameTextEndPos = rTextFrame.HasFollow() + ? rTextFrame.GetFollow()->GetOfst() + : rTextFrame.GetText().getLength(); // iteration over the redlines which overlap with the text node. const SwRedlineTable& rRedlineTable = rIDocChangeTrack.GetRedlineTable(); @@ -89,8 +89,8 @@ namespace { pActRedline->CalcStartEnd( rTextNode.GetIndex(), nTextNodeChangeTrackStart, nTextNodeChangeTrackEnd ); - if ( nTextNodeChangeTrackStart > nTextFrmTextEndPos || - nTextNodeChangeTrackEnd < nTextFrmTextStartPos ) + if ( nTextNodeChangeTrackStart > nTextFrameTextEndPos || + nTextNodeChangeTrackEnd < nTextFrameTextStartPos ) { // Consider only redlines which overlap with the text frame's text. continue; @@ -121,23 +121,23 @@ namespace { } if ( pMarkupList ) { - const sal_Int32 nTextFrmChangeTrackStart = - std::max(nTextNodeChangeTrackStart, nTextFrmTextStartPos); + const sal_Int32 nTextFrameChangeTrackStart = + std::max(nTextNodeChangeTrackStart, nTextFrameTextStartPos); - const sal_Int32 nTextFrmChangeTrackEnd = - std::min(nTextNodeChangeTrackEnd, nTextFrmTextEndPos); + const sal_Int32 nTextFrameChangeTrackEnd = + std::min(nTextNodeChangeTrackEnd, nTextFrameTextEndPos); pMarkupList->Insert( OUString(), nullptr, - nTextFrmChangeTrackStart, - nTextFrmChangeTrackEnd - nTextFrmChangeTrackStart, + nTextFrameChangeTrackStart, + nTextFrameChangeTrackEnd - nTextFrameChangeTrackStart, pMarkupList->Count() ); } } // eof iteration over the redlines which overlap with the text node } } // eof anonymous namespace -SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm ) - : mrTextFrm( rTextFrm ) +SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrame& rTextFrame ) + : mrTextFrame( rTextFrame ) , mpChangeTrackInsertionTextMarkupList( nullptr ) , mpChangeTrackDeletionTextMarkupList( nullptr ) , mpChangeTrackFormatChangeTextMarkupList( nullptr ) @@ -171,7 +171,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." ); OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == nullptr, "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." ); - initChangeTrackTextMarkupLists( mrTextFrm, + initChangeTrackTextMarkupLists( mrTextFrame, mpChangeTrackInsertionTextMarkupList, mpChangeTrackDeletionTextMarkupList, mpChangeTrackFormatChangeTextMarkupList ); |