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

Some minor changes and cleanup of Backward textfind

Browse source
This commit is contained in:
Mohammad Mahfuzur Rahman Mamun 2012-01-23 15:08:07 +06:00
parent 9afba5c75d
commit 0c02a163ea
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/textpage.cpp
View file

@ -933,9 +933,6 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
{
len=str.length();
bool hyphenated = false;
int changeHyphenated = 0;
// hyphenated '-' must be at the end of a word, so hyphenation means
// we have a '-' just followed by a '\n' character
// check if the string contains a '-' character
@ -949,10 +946,8 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
// 1. if the next character is '\n'
const QString &lookahedStr = (*(it+1))->text();
if(lookahedStr.at(0) == '\n'){
if(lookahedStr == "\n"){
len -= 1;
hyphenated = true;
changeHyphenated = 1;
}
else{
@ -971,8 +966,6 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
// cout << "b:" << str.toAscii().data() << lookahedStr.toAscii().data() << endl;
// str.remove(len-1,1);
len -= 1;
hyphenated = true;
changeHyphenated = 1;
}
}
@ -984,8 +977,6 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
// else if it is the second last entry - for example in pdf format
else if(str.endsWith("-\n")){
len -= 2;
hyphenated = true;
changeHyphenated = 1;
}
}
@ -1001,10 +992,6 @@ RegularAreaRect* TextPagePrivate::findTextInternalBackward( int searchID, const
int resStrLen = 0, resQueryLen = 0;
int offset = len - min;
if(hyphenated){
//offset = offset - changeHyphenated;
}
if ( !comparer( str.midRef(offset, min ), query.midRef( j - min + 1, min ),
&resStrLen, &resQueryLen ) )
{