anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't need the else, since all codepaths return.

Browse Source
This commit is contained in:
Richard Heck 2016-12-17 22:16:49 -05:00
parent 410b0fa581
commit ed0e4064d2
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lyxfind.cpp
View File

@ -978,24 +978,26 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con
// due to close wildcards added at end of regexp
if (close_wildcards == 0)
return m[0].second - m[0].first;
else
return m[m.size() - close_wildcards].first - m[0].first;
return m[m.size() - close_wildcards].first - m[0].first;
}
// else !use_regexp: but all code paths above return
LYXERR(Debug::FIND, "Searching in normal mode: par_as_string='"
<< par_as_string << "', str='" << str << "'");
LYXERR(Debug::FIND, "Searching in normal mode: lead_as_string='"
<< lead_as_string << "', par_as_string_nolead='"
<< par_as_string_nolead << "'");
if (at_begin) {
LYXERR(Debug::FIND, "size=" << par_as_string.size()
<< ", substr='" << str.substr(0, par_as_string.size()) << "'");
if (str.substr(0, par_as_string.size()) == par_as_string)
return par_as_string.size();
} else {
LYXERR(Debug::FIND, "Searching in normal mode: par_as_string='"
<< par_as_string << "', str='" << str << "'");
LYXERR(Debug::FIND, "Searching in normal mode: lead_as_string='"
<< lead_as_string << "', par_as_string_nolead='"
<< par_as_string_nolead << "'");
if (at_begin) {
LYXERR(Debug::FIND, "size=" << par_as_string.size()
<< ", substr='" << str.substr(0, par_as_string.size()) << "'");
if (str.substr(0, par_as_string.size()) == par_as_string)
return par_as_string.size();
} else {
size_t pos = str.find(par_as_string_nolead);
if (pos != string::npos)
return par_as_string.size();
}
size_t pos = str.find(par_as_string_nolead);
if (pos != string::npos)
return par_as_string.size();
}
return 0;
}