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

don't call cellIndex with invalid columns

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23969 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2008-03-26 10:34:48 +00:00
parent 72068adf9c
commit b98a650fa1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/insets/InsetTabular.cpp
View File

@ -1855,14 +1855,13 @@ int Tabular::TeXCellPreamble(odocstream & os, idx_type cell, bool & ismulticol)
LyXAlignment align = getAlignment(cell, !isMultiColumn(cell)); LyXAlignment align = getAlignment(cell, !isMultiColumn(cell));
// figure out how to set the lines // figure out how to set the lines
// we always set double lines to the right of the cell // we always set double lines to the right of the cell
row_type const r = cellRow(cell);
col_type const c = cellColumn(cell); col_type const c = cellColumn(cell);
col_type const nextcol = c + columnSpan(cell); col_type const nextcol = c + columnSpan(cell);
row_type const r = cellRow(cell);
idx_type const prevcell = cellIndex(r, c - 1);
idx_type const nextcell = cellIndex(r, nextcol);
bool prevmulticol = ismulticol; bool prevmulticol = ismulticol;
bool prevcellright = c > 0 && rightLine(prevcell); bool prevcellright = c > 0 && rightLine(cellIndex(r, c - 1));
bool nextcellleft = nextcol < columnCount() && leftLine(nextcell); bool nextcellleft = nextcol < columnCount()
&& leftLine(cellIndex(r, nextcol));
bool nextcolleft = nextcol < columnCount() && columnLeftLine(nextcol); bool nextcolleft = nextcol < columnCount() && columnLeftLine(nextcol);
bool coldouble = columnRightLine(c) && nextcolleft; bool coldouble = columnRightLine(c) && nextcolleft;
bool celldouble = rightLine(cell) && nextcellleft; bool celldouble = rightLine(cell) && nextcellleft;