Erase correctly math multi-cell selection

What a selection spans several cells in mathed, and a deletion occurs though LFUN_CHAR_DELETE_FORWARD for example, only the case of a proper grid was handled. When no such grid exists, all cells between the first and the last index are cleared now.

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index ad3ad7e23843b0e8f9f1f552621f535319a0ecaf..7329c248918f95b0e60b446626c4e0a6dcd38a52 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -1254,31 +1254,43 @@ void eraseSelection(Cursor & cur)
        //lyxerr << "cap::eraseSelection begin: " << cur << endl;
        CursorSlice const & i1 = cur.selBegin();
        CursorSlice const & i2 = cur.selEnd();
-       if (i1.inset().asInsetMath()) {
-               saveSelection(cur);
-               cur.top() = i1;
-               if (i1.idx() == i2.idx()) {
-                       i1.cell().erase(i1.pos(), i2.pos());
-                       // We may have deleted i1.cell(cur.pos()).
-                       // Make sure that pos is valid.
-                       if (cur.pos() > cur.lastpos())
-                               cur.pos() = cur.lastpos();
-               } else {
-                       InsetMath * p = i1.asInsetMath();
-                       Inset::row_type r1, r2;
-                       Inset::col_type c1, c2;
-                       region(i1, i2, r1, r2, c1, c2);
-                       for (Inset::row_type row = r1; row <= r2; ++row)
-                               for (Inset::col_type col = c1; col <= c2; ++col)
-                                       p->cell(p->index(row, col)).clear();
-                       // We've deleted the whole cell. Only pos 0 is valid.
-                       cur.pos() = 0;
-               }
-               // need a valid cursor. (Lgb)
-               cur.clearSelection();
+       if (!i1.asInsetMath()) {
+               LYXERR0("Can't erase this selection");
+               return;
+       }
+
+       saveSelection(cur);
+       cur.top() = i1;
+       InsetMath * p = i1.asInsetMath();
+       if (i1.idx() == i2.idx()) {
+               i1.cell().erase(i1.pos(), i2.pos());
+               // We may have deleted i1.cell(cur.pos()).
+               // Make sure that pos is valid.
+               if (cur.pos() > cur.lastpos())
+                       cur.pos() = cur.lastpos();
+       } else if (p->nrows() > 0 && p->ncols() > 0) {
+               // This is a grid, delete a nice square region
+               Inset::row_type r1, r2;
+               Inset::col_type c1, c2;
+               region(i1, i2, r1, r2, c1, c2);
+               for (Inset::row_type row = r1; row <= r2; ++row)
+                       for (Inset::col_type col = c1; col <= c2; ++col)
+                               p->cell(p->index(row, col)).clear();
+               // We've deleted the whole cell. Only pos 0 is valid.
+               cur.pos() = 0;
        } else {
-               lyxerr << "can't erase this selection 1" << endl;
+               Inset::idx_type idx1 = i1.idx();
+               Inset::idx_type idx2 = i2.idx();
+               if (idx1 > idx2)
+                       swap(idx1, idx2);
+               for (Inset::idx_type idx = idx1 ; idx <= idx2; ++idx)
+                       p->cell(idx).clear();
+               // We've deleted the whole cell. Only pos 0 is valid.
+               cur.pos() = 0;
        }
+
+       // need a valid cursor. (Lgb)
+       cur.clearSelection();
        //lyxerr << "cap::eraseSelection end: " << cur << endl;
 }