Second part of bug 580, avoid that lyx produces wrong files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19457 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2007-08-12 14:02:48 +00:00
parent eb0cea1356
commit 24d2120dab

View File

@ -721,8 +721,15 @@ void Tabular::deleteColumn(col_type const column)
return; return;
column_info.erase(column_info.begin() + column); column_info.erase(column_info.begin() + column);
for (row_type i = 0; i < rows_; ++i) for (row_type i = 0; i < rows_; ++i) {
// Care about multicolumn cells
if (column + 1 < columns_ &&
cell_info[i][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN &&
cell_info[i][column + 1].multicolumn == CELL_PART_OF_MULTICOLUMN) {
cell_info[i][column + 1].multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
}
cell_info[i].erase(cell_info[i].begin() + column); cell_info[i].erase(cell_info[i].begin() + column);
}
--columns_; --columns_;
fixCellNums(); fixCellNums();
} }