X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=6f6d0d53c937dcaa7905623b41a9c94237ce8396;hb=eea4ef9b6e8c103b8d77fb456214a116c68f58a7;hp=d45fdd32cf1737ff2417a7eedb7222b3d358b7b4;hpb=49aaf95894efefa80e4c7880e6e48ef1ee5738e4;p=lyx.git diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index d45fdd32cf..6f6d0d53c9 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -1565,8 +1565,8 @@ int Intervall::findclosing(int start, int end, char up = '{', char down = '}', i depth++; } else if (c == down) { - repeat--; if (depth == 0) { + repeat--; if ((repeat <= 0) || (par[i+1] != up)) return i; } @@ -3030,9 +3030,9 @@ MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, bool at << ", inTexted=" << cur.inTexted()); if (res == 0 || !at_begin || !opt.matchword || !cur.inTexted()) return mres; - if ((len > 0) && (res < len)) { + if ((len > 0) && (res < len)) { mres.match_len = 0; - return mres; + return mres; } Paragraph const & par = cur.paragraph(); bool ws_left = (cur.pos() > 0) @@ -3044,18 +3044,18 @@ MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, bool at LYXERR(Debug::FIND, "cur.pos()=" << cur.pos() << ", res=" << res << ", separ: " << ws_left << ", " << ws_right - << ", len: " << len + << ", len: " << len << endl); if (ws_left && ws_right) { - // Check for word separators inside the found 'word' - for (int i = 0; i < len; i++) { - if (par.isWordSeparator(cur.pos() + i)) { + // Check for word separators inside the found 'word' + for (int i = 0; i < len; i++) { + if (par.isWordSeparator(cur.pos() + i)) { mres.match_len = 0; - return mres; + return mres; } - } - return mres; - } + } + return mres; + } mres.match_len = 0; return mres; } @@ -3417,10 +3417,9 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match) match_len_zero_count = 0; } else { - if (++match_len_zero_count > 3) { - LYXERR(Debug::FIND, "match_len2_zero_count: " << match_len_zero_count << ", match_len was " << match_len); - match_len_zero_count = 0; - } + if (++match_len_zero_count > 3) { + LYXERR(Debug::FIND, "match_len2_zero_count: " << match_len_zero_count << ", match_len was " << match_len); + } break; } }