anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/InsetTabular.cpp: revert r36415.

Browse Source 
This went in without discussion and is IMHO wrong (bug #7055 is invalid).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37676 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-02-15 11:43:04 +00:00
parent ef1444b8df
commit 1f21f0f2dc
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/insets/InsetTabular.cpp
View File

@ -5173,28 +5173,11 @@ void InsetTabular::tabularFeatures(Cursor & cur,
if (len.zero()
&& tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_BLOCK)
tabularFeatures(cur, Tabular::ALIGN_CENTER, string());
// check if there is a 1-column multicolumn cell
// if so it must get the same width
for (row_type r = 0; r < tabular.nrows(); ++r) {
if (tabular.isMultiColumn(tabular.cellIndex(r, column))
&& tabular.columnSpan(tabular.cellIndex(r, column)) == 1)
tabular.setMColumnPWidth(cur, tabular.cellIndex(r, column), len);
}
break;
}
case Tabular::SET_MPWIDTH:
tabular.setMColumnPWidth(cur, cur.idx(), Length(value));
// if the multicolumn only spans 1 column, the width of the whole column
// must have the same width, see bug #7055
if (tabular.columnSpan(cur.idx()) == 1)
for (row_type r = 0; r < tabular.nrows(); ++r) {
if (!tabular.isMultiColumn(tabular.cellIndex(r, column)))
tabular.setColumnPWidth(cur, tabular.cellIndex(r, column), Length(value));
else if (tabular.isMultiColumn(tabular.cellIndex(r, column))
&& tabular.columnSpan(tabular.cellIndex(r, column)) == 1)
tabular.setMColumnPWidth(cur, tabular.cellIndex(r, column), Length(value));
}
break;
case Tabular::SET_MROFFSET: