anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35931 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-10-30 16:36:08 +00:00
parent 7c6a642f01
commit eef6b32eff
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/qt4/GuiTabular.cpp
View File

@ -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);

6
src/insets/InsetTabular.cpp
View File

@ -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());

2
src/insets/InsetTabular.h
View File

@ -243,8 +243,6 @@ public:
///
SET_SPECIAL_MULTICOLUMN,
///
SET_SPECIAL_MULTIROW,
///
SET_BOOKTABS,
///
UNSET_BOOKTABS,