Commit c78a7069 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

fix bad merge

parent a9fd4400
......@@ -836,9 +836,7 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
// queryLeft is the length of the query we have left
const TinyTextEntity* curEntity = 0;
int j=query.length() - 1, len=0, queryLeft=query.length();
int offset = 0;
bool haveMatch=false;
bool dontIncrement=false;
bool offsetMoved = false;
TextList::ConstIterator it = start;
TextList::ConstIterator it_begin;
......@@ -848,10 +846,6 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
const QString &str = curEntity->text();
if ( !offsetMoved && ( it == start ) )
{
if ( m_searchPoints.contains( searchID ) )
{
offset = qMax( m_searchPoints[ searchID ]->offset_begin, 0 );
}
offsetMoved = true;
}
if ( query.at(j).isSpace() )
......@@ -862,14 +856,9 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
#endif
j--;
queryLeft--;
// since we do not really need to increment this after this
// run of the loop finishes because we are not comparing it
// to any entity, rather we are deducing a situation in a document
dontIncrement=true;
}
else
{
dontIncrement=false;
len=str.length();
int min=qMin(queryLeft,len);
#ifdef DEBUG_TEXTPAGE
......@@ -892,7 +881,6 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
kDebug(OkularDebug) << "\tnot matched";
#endif
j=query.length() - 1;
offset = 0;
queryLeft=query.length();
it_begin = TextList::ConstIterator();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment