citation patch from Angus

[lyx.git] / src / table.C

diff --git a/src/table.C b/src/table.C
index adccb93d9e4c8974bc1e8b54b0e616d4f3c90e0a..e9972a7e7bbc56f5053f885508dcf54246c3b549 100644 (file)
--- a/src/table.C
+++ b/src/table.C
@@ -187,7 +187,7 @@ LyXTable & LyXTable::operator=(LyXTable const & lt)
 LyXTable * LyXTable::Clone()
 {
     LyXTable * result = new LyXTable(rows, columns);
-    int row, column;;
+    int row, column;
 
     for (row = 0; row < rows; ++row) {
         for (column = 0; column < columns; ++column) {
@@ -977,7 +977,8 @@ void LyXTable::Read(istream & is)
        int h = 0;
        
        string s;
-       getline(is, s);
+       while(!s.length())
+           getline(is, s);
        if (s.length() > 8)
                version = atoi(s.c_str() + 8);
        else
@@ -1367,8 +1368,8 @@ int LyXTable::TexEndOfCell(ostream & os, int cell)
                os << "\\multicolumn{"
                   << cells_in_multicolumn(nvcell)
                   << "}{";
-            if (!cellinfo_of_cell(cell+1)->align_special.empty()) {
-                   os << cellinfo_of_cell(cell+1)->align_special
+            if (!cellinfo_of_cell(nvcell)->align_special.empty()) {
+                   os << cellinfo_of_cell(nvcell)->align_special
                       << "}{";
             } else {
                 if (LeftLine(nvcell))