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

InsetTabular.cpp: fix #7003 that I accidentally introduced when fixing #6958

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35966 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-11-01 16:16:40 +00:00
parent 85b09e9d04
commit bc30270b35
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/insets/InsetTabular.cpp
View File

@ -106,6 +106,8 @@ struct TabularFeature {
TabularFeature tabularFeature[] = TabularFeature tabularFeature[] =
{ {
// the SET/UNSET actions are used by the table dialog,
// the TOGGLE actions by the table toolbar buttons
{ Tabular::APPEND_ROW, "append-row", false }, { Tabular::APPEND_ROW, "append-row", false },
{ Tabular::APPEND_COLUMN, "append-column", false }, { Tabular::APPEND_COLUMN, "append-column", false },
{ Tabular::DELETE_ROW, "delete-row", false }, { Tabular::DELETE_ROW, "delete-row", false },
@ -116,7 +118,6 @@ TabularFeature tabularFeature[] =
{ Tabular::SET_LINE_BOTTOM, "set-line-bottom", true }, { Tabular::SET_LINE_BOTTOM, "set-line-bottom", true },
{ Tabular::SET_LINE_LEFT, "set-line-left", true }, { Tabular::SET_LINE_LEFT, "set-line-left", true },
{ Tabular::SET_LINE_RIGHT, "set-line-right", true }, { Tabular::SET_LINE_RIGHT, "set-line-right", true },
//FIXME: get rid of those 4 TOGGLE actions in favor of the 4 above.
{ Tabular::TOGGLE_LINE_TOP, "toggle-line-top", false }, { Tabular::TOGGLE_LINE_TOP, "toggle-line-top", false },
{ Tabular::TOGGLE_LINE_BOTTOM, "toggle-line-bottom", false }, { Tabular::TOGGLE_LINE_BOTTOM, "toggle-line-bottom", false },
{ Tabular::TOGGLE_LINE_LEFT, "toggle-line-left", false }, { Tabular::TOGGLE_LINE_LEFT, "toggle-line-left", false },
@ -851,13 +852,14 @@ void Tabular::updateIndexes()
for (col_type column = 0; column < ncols(); ++column) { for (col_type column = 0; column < ncols(); ++column) {
if (isPartOfMultiColumn(row, column)) if (isPartOfMultiColumn(row, column))
continue; continue;
setFixedWidth(row, column);
cell_info[row][column].inset->setContentAlignment(
getAlignment(cellIndex(row, column)));
if (!isPartOfMultiRow(row, column)) { if (!isPartOfMultiRow(row, column)) {
columnofcell[i] = column; columnofcell[i] = column;
rowofcell[i] = row; rowofcell[i] = row;
} else }
setFixedWidth(row, column);
cell_info[row][column].inset->setContentAlignment(
getAlignment(cellIndex(row, column)));
if (isPartOfMultiRow(row, column))
continue; continue;
++i; ++i;
} }