fix handling of one column tables

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

diff --git a/src/ChangeLog b/src/ChangeLog
index c364b1591a5109f476d20a144f6d55847af415e4..f9fbb0786ca1880e3d93a4d52c74ca55b91c05e9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-17  José Matos  <jamatos@fc.up.pt>
+
+       * tabular.C (recalculateMulticolumns): fix handling of one column
+       tables.
+
 2005-07-17  Juergen Vigna  <jug@lyx.org>
 
        * text.C (Delete, backspace): fixed so that paragraph with the
@@ -40,7 +45,7 @@
 
        * paragraph.h: add parameter boundary for getRow() function
 
-2005-07-18  José Matos  <jamatos@fc.up.pt>
+2005-07-17  José Matos  <jamatos@fc.up.pt>
 
        * buffer.C:
        * bufferparams.[Ch]:

diff --git a/src/tabular.C b/src/tabular.C
index c0c2e9a8a0f9659d826d330a136891ec2b85fc4d..ecde4d1884f9e857dc3cbab7893a31eff4c4eef5 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -798,7 +798,7 @@ void LyXTabular::recalculateMulticolumnsOfColumn(col_type column)
        // the last column does not have to be recalculated because all
        // multicolumns will have here there last multicolumn cell which
        // always will have the whole rest of the width of the cell.
-       if (column > (columns_ - 2))
+       if (columns_ < 2 || column > (columns_ - 2))
                return;
        for (row_type row = 0; row < rows_; ++row) {
                int mc = cell_info[row][column].multicolumn;