diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-21 09:59:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-21 14:04:42 +0000 |
| commit | 6de7da389a9b607ebdf1a01a58ccf1bfbff42007 (patch) | |
| tree | fb66324100ad7f618a51ff2fe754b39c2b4a4974 | |
| parent | 522fd11122b1bb5f4ec110ea4a12bb7640d0f795 (diff) | |
longparas: these are really xub_StrLens
Change-Id: Ia754de347f277a07479e4056b7c9a03534a3dab4
| -rw-r--r-- | sw/inc/redline.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/doc/docredln.cxx | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index b49b6d964cdd..3256bb305516 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -247,7 +247,7 @@ public: void ShowOriginal( sal_uInt16 nLoop = 0 ); /// Calculates the intersection with text node number nNdIdx. - void CalcStartEnd( sal_uLong nNdIdx, sal_uInt16& nStart, sal_uInt16& nEnd ) const; + void CalcStartEnd( sal_uLong nNdIdx, xub_StrLen& rStart, xub_StrLen& rEnd ) const; /// Initiate the layout. void InvalidateRange(); diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index ee4db2620a16..2e606aa6375d 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -3258,36 +3258,36 @@ void SwRedline::InvalidateRange() // trigger the Layout /** Calculates the start and end position of the intersection rTmp and text node nNdIdx */ -void SwRedline::CalcStartEnd( sal_uLong nNdIdx, sal_uInt16& nStart, sal_uInt16& nEnd ) const +void SwRedline::CalcStartEnd( sal_uLong nNdIdx, xub_StrLen& rStart, xub_StrLen& rEnd ) const { const SwPosition *pRStt = Start(), *pREnd = End(); if( pRStt->nNode < nNdIdx ) { if( pREnd->nNode > nNdIdx ) { - nStart = 0; // Paragraph is completely enclosed - nEnd = STRING_LEN; + rStart = 0; // Paragraph is completely enclosed + rEnd = STRING_LEN; } else { OSL_ENSURE( pREnd->nNode == nNdIdx, "SwRedlineItr::Seek: GetRedlinePos Error" ); - nStart = 0; // Paragraph is overlapped in the beginning - nEnd = pREnd->nContent.GetIndex(); + rStart = 0; // Paragraph is overlapped in the beginning + rEnd = pREnd->nContent.GetIndex(); } } else if( pRStt->nNode == nNdIdx ) { - nStart = pRStt->nContent.GetIndex(); + rStart = pRStt->nContent.GetIndex(); if( pREnd->nNode == nNdIdx ) - nEnd = pREnd->nContent.GetIndex(); // Within the Paragraph + rEnd = pREnd->nContent.GetIndex(); // Within the Paragraph else - nEnd = STRING_LEN; // Paragraph is overlapped in the end + rEnd = STRING_LEN; // Paragraph is overlapped in the end } else { - nStart = STRING_LEN; - nEnd = STRING_LEN; + rStart = STRING_LEN; + rEnd = STRING_LEN; } } |