Call an update before setting the_locking_inset = 0 as otherwise we

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index d38a35714dc56a303e2f4d7c0da129be3e15495c..6d26b3a4c1ad0fb8ed052d30f1768d8c2b11c6a0 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1461,8 +1461,10 @@ void LyXTabular::OldFormatRead(BufferParams const & bp,
                if (token.empty())
                        continue;
                if (token == "\\layout"
-                       || token == "\\end_float"
-                       || token == "\\end_deeper") {
+                       || token == "\\end_float" // this should not exist anymore
+                       || token == "\\end_inset" // as it is substituted by this
+                       || token == "\\end_deeper")
+               {
                        lex.pushToken(token);
 #ifndef NO_COMPABILITY
                        // Here we need to insert the inset_ert_contents into the last
@@ -1471,6 +1473,12 @@ void LyXTabular::OldFormatRead(BufferParams const & bp,
 #endif
                        break;
                }
+#ifndef NO_COMPABILITY
+               if (token == "\\newline")
+                       // Here we need to insert the inset_ert_contents into the last
+                       // cell of the tabular.
+                       owner_->bufferOwner()->insertErtContents(par, pos, false);
+#endif
                if (owner_->bufferOwner()->parseSingleLyXformat2Token(lex, par,
                                                                                                                          return_par,
                                                                                                                          token, pos,