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

Small fix in AppendColumn.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3276 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2002-01-02 14:04:45 +00:00
parent 95616fc9b3
commit 8aa3b4fc77
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
po/POTFILES.in
View File

@ -9,6 +9,7 @@ src/converter.C
src/CutAndPaste.C
src/debug.C
src/exporter.C
src/ext_l10n.h
src/figure_form.C
src/figureForm.C
src/FontLoader.C
@ -174,7 +175,6 @@ src/insets/inseturl.C
src/kbsequence.C
src/language.C
src/LaTeX.C
src/layout.C
src/LColor.C
src/LyXAction.C
src/lyx_cb.C
@ -184,6 +184,7 @@ src/lyxfunc.C
src/lyx_main.C
src/lyxrc.C
src/LyXSendto.C
src/lyxtextclasslist.C
src/lyxvc.C
src/LyXView.C
src/mathed/formulabase.C

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2002-01-02 Juergen Vigna <jug@sad.it>
* tabular.C (AppendColumn): hopefully fixed this memory access problem.
2001-12-28 Lars Gullik Bjønnes <larsbj@birdstep.com>
* screen.C (topCursorVisible): introduce a temp var for

8
src/tabular.C
View File

@ -301,11 +301,13 @@ void LyXTabular::AppendColumn(int cell)
c_info[i][j] = cell_info[i][j - 1];
}
// care about multicolumns
if (c_info[i][column + 1].multicolumn==CELL_BEGIN_OF_MULTICOLUMN) {
if (c_info[i][column + 1].multicolumn==CELL_BEGIN_OF_MULTICOLUMN)
{
c_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
}
if ((column + 1) == columns_ ||
c_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN) {
if ((column + 2) >= columns_ ||
c_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN)
{
c_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
}
}