]> git.lyx.org Git - features.git/commitdiff
FindAdv: Fix expression checking for 'int' as if it were bool
authorKornel Benko <kornel@lyx.org>
Wed, 25 May 2022 19:34:17 +0000 (21:34 +0200)
committerKornel Benko <kornel@lyx.org>
Wed, 25 May 2022 19:34:17 +0000 (21:34 +0200)
Since the element 'match_len' in class MatchResult is an integer,
the check 'if (!match(...).match_len))' is changed to
'if (match(...).match_len) <= 0)'

src/lyxfind.cpp

index 3963c9633164c0efe42ff94b8077514cc1d82702..ac6366c2620e4ad655b03063078a2d32f9247dd8 100644 (file)
@@ -4566,7 +4566,8 @@ MatchResult findMostBackwards(DocIterator & cur, MatchStringAdv const & match, M
                LYXERR(Debug::FINDVERBOSE, "findMostBackwards(): cur=" << cur);
                DocIterator new_cur = cur;
                new_cur.backwardPos();
-               if (new_cur == cur || &new_cur.inset() != &inset || !match(new_cur, -1, MatchStringAdv::MatchFromStart).match_len)
+               if (new_cur == cur || &new_cur.inset() != &inset
+                   || match(new_cur, -1, MatchStringAdv::MatchFromStart).match_len <= 0)
                        break;
                MatchResult new_mr = findAdvFinalize(new_cur, match, expected);
                if (new_mr.match_len == mr.match_len)
@@ -4764,7 +4765,7 @@ static int findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, Ma
                return 0;
        LASSERT(sel_len > 0, return 0);
 
-       if (!matchAdv(sel_beg, sel_len, MatchStringAdv::MatchFromStart).match_len)
+       if (matchAdv(sel_beg, sel_len, MatchStringAdv::MatchFromStart).match_len <= 0)
                return 0;
 
        // Build a copy of the replace buffer, adapted to the KeepCase option