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

fix bug 580: reading of some ill-formed tables

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19390 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-08-10 08:05:10 +00:00
parent a1687b08aa
commit cf96711fc9
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/insets/InsetTabular.cpp
View File

@ -749,15 +749,23 @@ void Tabular::set_row_column_number_info()
numberofcells = 0; numberofcells = 0;
for (row_type row = 0; row < rows_; ++row) { for (row_type row = 0; row < rows_; ++row) {
for (col_type column = 0; column < columns_; ++column) { for (col_type column = 0; column < columns_; ++column) {
// If on its left is either the edge, or a normal cell,
// then this cannot be a non-begin multicol cell.
// Clean up as well as we can:
if (cell_info[row][column].multicolumn
== CELL_PART_OF_MULTICOLUMN) {
if (column == 0 ||
cell_info[row][column - 1]
.multicolumn == CELL_NORMAL)
cell_info[row][column].multicolumn =
CELL_NORMAL;
}
// Count only non-multicol cells plus begin multicol
// cells, ignore non-begin multicol cells:
if (cell_info[row][column].multicolumn if (cell_info[row][column].multicolumn
!= Tabular::CELL_PART_OF_MULTICOLUMN) != Tabular::CELL_PART_OF_MULTICOLUMN)
++numberofcells; ++numberofcells;
if (numberofcells == 0)
// FIXME: Is this intended?
cell_info[row][column].cellno = npos;
else
cell_info[row][column].cellno =
numberofcells - 1;
} }
} }