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

fix bug 580

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19391 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-08-10 08:21:26 +00:00
parent f9583da78e
commit d22e679d78
2 changed files with 15 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;
for (row_type row = 0; row < rows_; ++row) {
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
!= Tabular::CELL_PART_OF_MULTICOLUMN)
++numberofcells;
if (numberofcells == 0)
// FIXME: Is this intended?
cell_info[row][column].cellno = npos;
else
cell_info[row][column].cellno =
numberofcells - 1;
}
}

1
status.15x
View File

@ -48,6 +48,7 @@ What's new
'Load' to 'Edit' in the child document dialog. (Bugs 4107 and 4111)
- Fix bug 4112: Do roman numerals beyond 20.
- Fix bug 580: Some malformed tables are now rendered correctly.
- Enable File -> Revert when the file is externally modified, and rename
this menu item to File -> Revert to saved. (Bugs 3766 and 4114)