diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-03-01 08:37:07 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-04-05 11:25:09 +0200 |
| commit | 16fe1b047db11718de9a15f3b24a23fd51ef3a31 (patch) | |
| tree | cd60a38fc2c8210d159d935f3d8080cfc5cbffbb /sw | |
| parent | 65a87350bc0b69a83a43fe012e2abe6778a17010 (diff) | |
Default value of nLookahead is never overridden
Change-Id: I3341b307f56f5bcdde7a667aa3968c1444376705
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/docary.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/doc/docredln.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 8768cc037b70..676ac4e773b2 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -208,11 +208,11 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; + sal_uInt16 FindNextOfSeqNo( sal_uInt16 nSttPos ) const; + sal_uInt16 FindPrevOfSeqNo( sal_uInt16 nSttPos ) const; /** Search next or previous Redline with the same Seq. No. Search can be restricted via Lookahead. Using 0 or USHRT_MAX makes search the whole array. */ - sal_uInt16 FindNextOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead = 20 ) const; - sal_uInt16 FindPrevOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead = 20 ) const; sal_uInt16 FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos, sal_uInt16 nLookahead = 20 ) const; sal_uInt16 FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos, diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index cc8c193ab481..5c4f228d5c58 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -499,16 +499,16 @@ void SwRedlineTbl::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) /// Find the next or preceding Redline with the same seq.no. /// We can limit the search using look ahead. /// 0 or USHRT_MAX searches the whole array. -sal_uInt16 SwRedlineTbl::FindNextOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead ) const +sal_uInt16 SwRedlineTbl::FindNextOfSeqNo( sal_uInt16 nSttPos ) const { return static_cast<size_t>(nSttPos) + 1 < size() - ? FindNextSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos+1, nLookahead ) + ? FindNextSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos+1 ) : USHRT_MAX; } -sal_uInt16 SwRedlineTbl::FindPrevOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead ) const +sal_uInt16 SwRedlineTbl::FindPrevOfSeqNo( sal_uInt16 nSttPos ) const { - return nSttPos ? FindPrevSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos-1, nLookahead ) + return nSttPos ? FindPrevSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos-1 ) : USHRT_MAX; } |