Small fix in AppendColumn.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3276 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17e2f1d40cdd557c75714eb3c5ceca23454d8790..d1725fb6609df7aab9891d762bfb18c936b885c2 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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

diff --git a/src/ChangeLog b/src/ChangeLog
index 9562e2a92ca1eb01beaf20598c7c1765003580ef..8d9e80b4d831abdb286548b48cd57ddc26e31b60 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/tabular.C b/src/tabular.C
index 80dfcbcfc04b589055a05c8d9f9abcaded7356a8..85adc025e617e93bc7f6985cf102bb1bb1c64838 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -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;
                }
        }