office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 14:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.9'

Browse source
This commit is contained in:
Albert Astals Cid 2012-11-02 22:26:10 +01:00
parent 9843a76cc0 d59ffb4a7a
commit 769e079e70
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/textpage.cpp
View file

@ -953,7 +953,7 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
Qt::CaseSensitivity caseSensitivity,
TextComparisonFunction comparer,
const TextList::ConstIterator &start,
const TextList::ConstIterator &end )
const TextList::ConstIterator &loop_end )
{
const QTransform matrix = m_page ? m_page->rotationMatrix() : QTransform();
@ -992,7 +992,7 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
}
else
{
len = stringLengthAdaptedWithHyphen(str, it, end, m_page);
len = stringLengthAdaptedWithHyphen(str, it, m_words.constEnd(), m_page);
int min=qMin(queryLeft,len);
#ifdef DEBUG_TEXTPAGE
kDebug(OkularDebug) << str.right(min) << " : " << _query.mid(j-min+1,min);
@ -1057,7 +1057,7 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
ret->simplify();
return ret;
}
if ( it == end )
if ( it == loop_end )
break;
else
--it;