X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=a2ae1aed8f33b772ea527dbb824c2ff9b874bc4f;hb=81badf8550f2fd5e614a22261c4885d747a72106;hp=bd4e23db0af4737c6c4bdc957c47e51feab775e6;hpb=35ec98bcb2f478608926143617260745e4c0dc39;p=lyx.git diff --git a/src/Text.cpp b/src/Text.cpp index bd4e23db0a..a2ae1aed8f 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -1276,8 +1276,7 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op) LBUFERR(this == cur.text()); if (!cur.selection()) { - bool const changed = cur.paragraph().isChanged(cur.pos()); - if (!(changed && findNextChange(&cur.bv()))) + if (!selectChange(cur)) return; } @@ -1293,7 +1292,6 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op) bool endsBeforeEndOfPar = (endPos < pars_[endPit].size()); // first, accept/reject changes within each individual paragraph (do not consider end-of-par) - for (pit_type pit = begPit; pit <= endPit; ++pit) { pos_type parSize = pars_[pit].size(); @@ -1369,11 +1367,8 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op) } // finally, invoke the DEPM - deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().track_changes); - // - cur.finishUndo(); cur.clearSelection(); setCursorIntern(cur, begPit, begPos);