From eef6b32eff98c54cec11e73dd45eedf7c25a0bb3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 30 Oct 2010 16:36:08 +0000 Subject: [PATCH] InsetTabular.cpp; remove SET_SPECIAL_MULTIROW because according to the multirow documentation multirows inherit the LaTeX-argument from the current column since they don't span multiple columns git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35931 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiTabular.cpp | 12 +++--------- src/insets/InsetTabular.cpp | 6 ------ src/insets/InsetTabular.h | 2 -- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 87494cdeb1..4cc6915642 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -441,9 +441,6 @@ docstring GuiTabular::dialogToParams() const special = "none"; if (multicolumnCB->isChecked()) setParam(param_str, Tabular::SET_SPECIAL_MULTICOLUMN, special); - else if (multirowCB->isChecked()) - //FIXME SET_SPECIAL_MULTIROW not implemented! - setParam(param_str, Tabular::SET_SPECIAL_MULTIROW); else setParam(param_str, Tabular::SET_SPECIAL_COLUMN, special); @@ -576,8 +573,7 @@ static Length getMColumnPWidth(Tabular const & t, size_t cell) static docstring getAlignSpecial(Tabular const & t, size_t cell, int what) { - if (what == Tabular::SET_SPECIAL_MULTICOLUMN - || what == Tabular::SET_SPECIAL_MULTIROW) + if (what == Tabular::SET_SPECIAL_MULTICOLUMN) return t.cellInfo(cell).align_special; return t.column_info[t.cellColumn(cell)].align_special; } @@ -626,11 +622,9 @@ void GuiTabular::paramsToDialog(Inset const * inset) special = getAlignSpecial(tabular, cell, Tabular::SET_SPECIAL_MULTICOLUMN); pwidth = getMColumnPWidth(tabular, cell); - } else if (multirow) { - special = getAlignSpecial(tabular, cell, - Tabular::SET_SPECIAL_MULTIROW); + } else if (multirow) pwidth = getMColumnPWidth(tabular, cell); - } else { + else { special = getAlignSpecial(tabular, cell, Tabular::SET_SPECIAL_COLUMN); pwidth = getColumnPWidth(tabular, cell); diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 489f90d172..1a12c60b85 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -168,7 +168,6 @@ TabularFeature tabularFeature[] = { Tabular::UNSET_LTCAPTION, "unset-ltcaption", false }, { Tabular::SET_SPECIAL_COLUMN, "set-special-column", true }, { Tabular::SET_SPECIAL_MULTICOLUMN, "set-special-multicolumn", true }, - { Tabular::SET_SPECIAL_MULTIROW, "set-special-multirow", false }, { Tabular::SET_BOOKTABS, "set-booktabs", false }, { Tabular::UNSET_BOOKTABS, "unset-booktabs", false }, { Tabular::SET_TOP_SPACE, "set-top-space", true }, @@ -4191,7 +4190,6 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd, case Tabular::SET_MPWIDTH: case Tabular::SET_SPECIAL_COLUMN: case Tabular::SET_SPECIAL_MULTICOLUMN: - case Tabular::SET_SPECIAL_MULTIROW: case Tabular::APPEND_ROW: case Tabular::APPEND_COLUMN: case Tabular::DELETE_ROW: @@ -5050,10 +5048,6 @@ void InsetTabular::tabularFeatures(Cursor & cur, tabular.setAlignSpecial(cur.idx(), from_utf8(value), feature); break; - case Tabular::SET_SPECIAL_MULTIROW: - // nothing to do - break; - case Tabular::APPEND_ROW: // append the row into the tabular tabular.appendRow(cur.idx()); diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index c989c34648..03b66ae7af 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -243,8 +243,6 @@ public: /// SET_SPECIAL_MULTICOLUMN, /// - SET_SPECIAL_MULTIROW, - /// SET_BOOKTABS, /// UNSET_BOOKTABS, -- 2.39.2