DocBook: add a TODO for a newly discovered bug.

[features.git] / src / insets / InsetTabular.cpp

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 15f1ca7dd98ca009e2c5c1fcfac56366661e9345..24bde65c5c51012a322c22e5f33adcc2323d7ef8 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2605,7 +2605,7 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, list<col_type> columns,
                                                break;
                                }
 
-                               for (col_type j = cstart ; j < c ; ++j)
+                               for (col_type j = cstart ; j <= c ; ++j)
                                        if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
                                                ++offset;
                                col_type lastcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset;
@@ -2741,7 +2741,7 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, list<col_type> colum
                                                break;
                                }
 
-                               for (col_type j = cstart ; j < c ; ++j)
+                               for (col_type j = cstart ; j <= c ; ++j)
                                        if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
                                                ++offset;
                                col_type lastcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset;
@@ -5548,8 +5548,6 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
                case Tabular::SET_SPECIAL_MULTICOLUMN:
                case Tabular::APPEND_ROW:
                case Tabular::APPEND_COLUMN:
-               case Tabular::DELETE_ROW:
-               case Tabular::DELETE_COLUMN:
                case Tabular::COPY_ROW:
                case Tabular::COPY_COLUMN:
                case Tabular::SET_TOP_SPACE:
@@ -5558,6 +5556,13 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
                        status.clear();
                        return true;
 
+               case Tabular::DELETE_ROW:
+                       status.setEnabled(tabular.nrows() > 1);
+                       break;
+               case Tabular::DELETE_COLUMN:
+                       status.setEnabled(tabular.ncols() > 1);
+                       break;
+
                case Tabular::SET_TABULAR_WIDTH:
                        status.setEnabled(!tabular.rotate
                                && tabular.tabular_valignment == Tabular::LYX_VALIGN_MIDDLE);
@@ -6139,21 +6144,21 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-Inset::RowFlags InsetTabular::rowFlags() const
+int InsetTabular::rowFlags() const
 {
-               if (tabular.is_long_tabular) {
-                       switch (tabular.longtabular_alignment) {
-                       case Tabular::LYX_LONGTABULAR_ALIGN_LEFT:
-                               return Display | AlignLeft;
-                       case Tabular::LYX_LONGTABULAR_ALIGN_CENTER:
-                               return Display;
-                       case Tabular::LYX_LONGTABULAR_ALIGN_RIGHT:
-                               return Display | AlignRight;
-                       default:
-                               return Display;
-                       }
-               } else
-                       return Inline;
+       if (tabular.is_long_tabular) {
+               switch (tabular.longtabular_alignment) {
+               case Tabular::LYX_LONGTABULAR_ALIGN_LEFT:
+                       return Display | AlignLeft;
+               case Tabular::LYX_LONGTABULAR_ALIGN_CENTER:
+                       return Display;
+               case Tabular::LYX_LONGTABULAR_ALIGN_RIGHT:
+                       return Display | AlignRight;
+               default:
+                       return Display;
+               }
+       } else
+               return Inline;
 }