diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-09-02 15:58:00 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-02 16:02:19 +0200 |
commit | b23999755a865a277c29adfc1dc0c249275bfd7e (patch) | |
tree | 3d0ab8ae1281c819b21f749a59998447c4a6fc01 /linguistic | |
parent | 8248dbeb71264a6911fbb1611c745bb766c37546 (diff) |
fdo#68750: ensure that GetSuggestedEndOfSentence makes progress
Checking a string of 17399 spaces takes 20 seconds here in
GrammarCheckingIterator::GetSuggestedEndOfSentence() because
BreakIterator_Unicode::endOfSentence() will always return
0 as a result regardless of what nStartPos it gets.
Change-Id: Id02440a91d7015c2896e387854445ee5383092fa
Diffstat (limited to 'linguistic')
-rw-r--r-- | linguistic/source/gciterator.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index b806c22047d9..694dcd725846 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -754,13 +754,23 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence( m_xBreakIterator = i18n::BreakIterator::create(xContext); } sal_Int32 nTextLen = rText.getLength(); - sal_Int32 nEndPosition; + sal_Int32 nEndPosition(0); sal_Int32 nTmpStartPos = nSentenceStartPos; do { + sal_Int32 const nPrevEndPosition(nEndPosition); nEndPosition = nTextLen; if (nTmpStartPos < nTextLen) + { nEndPosition = m_xBreakIterator->endOfSentence( rText, nTmpStartPos, rLocale ); + if (nEndPosition <= nPrevEndPosition) + { + // fdo#68750 if there's no progress at all then presumably + // there's no end of sentence in this paragraph so just + // set the end position to end of paragraph + nEndPosition = nTextLen; + } + } if (nEndPosition < 0) nEndPosition = nTextLen; |