citation patch from Angus

[lyx.git] / src / table.C

diff --git a/src/table.C b/src/table.C
index bd12c5fe26a25c724e235b890d26ce019b8c5aa0..e9972a7e7bbc56f5053f885508dcf54246c3b549 100644 (file)
--- a/src/table.C
+++ b/src/table.C
@@ -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))