anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InsetTabular.cpp: fix #6985 - we need to break after unsetting otherwise case Tabular::MULTICOLUMN: would be executed afterwards reverting the unsetting

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35955 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-11-01 03:26:25 +00:00
parent 892bc7dac3
commit fa695f939c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/insets/InsetTabular.cpp
View File

@ -1598,15 +1598,16 @@ Tabular::idx_type Tabular::setMultiRow(idx_type cell, idx_type number)
for (idx_type i = 0; i < number; ++i)
unsetMultiColumn(cellIndex(row + i, col));
// unsetting of multicol may have invalidated cell index
// unsetting of multirow may have invalidated cell index
cell = cellIndex(row, col);
CellData & cs = cellInfo(cell);
cs.multirow = CELL_BEGIN_OF_MULTIROW;
cs.valignment = LYX_VALIGN_MIDDLE;
// FIXME: the horizontal alignment of multirow cells can only
// be changed for the whole table,
// support for this needs to be implemented but us a fileformat
// change (assigning this to uwestoehr)
// the horizontal alignment of multirow cells can only
// be changed for the whole table row,
// support changing this only for the multirow cell can be done via
// \multirowsetup
// this feature would be a fileformat change
// until LyX supports this, use the deault alignment of multirow
// cells: left
cs.alignment = LYX_ALIGN_CENTER;
@ -5184,6 +5185,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
tabular.unsetMultiColumn(cur.idx());
break;
}
break;
}
case Tabular::MULTICOLUMN: {
@ -5220,6 +5222,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
tabular.unsetMultiRow(cur.idx());
break;
}
break;
}
case Tabular::MULTIROW: {