Revert "Fix toggle-line for multi-cell selection"

This changes the behavior of the table border toolbar in a way I am not sure everybody appreciates.

This reverts commit 022228e56f2a58d3a6a79af26e38470ebd74dcaf.

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 99863e9332e8941283684478df5c5a454ba7bf0a..86718b0b87aabfe8ba4e4c3cedecd7aa0195f472 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -5957,45 +5957,41 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 
        case Tabular::SET_LINE_TOP:
        case Tabular::TOGGLE_LINE_TOP: {
+               bool lineSet = (feature == Tabular::SET_LINE_TOP)
+                              ? (value == "true") : !tabular.topLine(cur.idx());
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
-                       for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
-                               bool const lineSet = (feature == Tabular::SET_LINE_TOP)
-                                          ? (value == "true") : !tabular.topLine(tabular.cellIndex(r, c));
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
                                tabular.setTopLine(tabular.cellIndex(r, c), lineSet);
-                       }
                break;
        }
 
        case Tabular::SET_LINE_BOTTOM:
        case Tabular::TOGGLE_LINE_BOTTOM: {
+               bool lineSet = (feature == Tabular::SET_LINE_BOTTOM)
+                              ? (value == "true") : !tabular.bottomLine(cur.idx());
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
-                       for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
-                               bool const lineSet = (feature == Tabular::SET_LINE_BOTTOM)
-                                          ? (value == "true") : !tabular.bottomLine(tabular.cellIndex(r, c));
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
                                tabular.setBottomLine(tabular.cellIndex(r, c), lineSet);
-                       }
                break;
        }
 
        case Tabular::SET_LINE_LEFT:
        case Tabular::TOGGLE_LINE_LEFT: {
+               bool lineSet = (feature == Tabular::SET_LINE_LEFT)
+                              ? (value == "true") : !tabular.leftLine(cur.idx());
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
-                       for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
-                               bool const lineSet = (feature == Tabular::SET_LINE_LEFT)
-                                       ? (value == "true") : !tabular.leftLine(tabular.cellIndex(r, c));
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
                                tabular.setLeftLine(tabular.cellIndex(r, c), lineSet);
-                       }
                break;
        }
 
        case Tabular::SET_LINE_RIGHT:
        case Tabular::TOGGLE_LINE_RIGHT: {
+               bool lineSet = (feature == Tabular::SET_LINE_RIGHT)
+                              ? (value == "true") : !tabular.rightLine(cur.idx());
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
-                       for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
-                               bool const lineSet = (feature == Tabular::SET_LINE_RIGHT)
-                                          ? (value == "true") : !tabular.rightLine(tabular.cellIndex(r, c));
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
                                tabular.setRightLine(tabular.cellIndex(r, c), lineSet);
-                       }
                break;
        }