prevent crash when inserting minipage in table cell,

[lyx.git] / src / insets / insettext.C

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index addaed18b4305f3502d8593f9d4797b78f1bf102..78bb89071e290ff205c68048b367bec53a8d7550 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -252,8 +252,8 @@ void InsetText::read(Buffer const * buf, LyXLex & lex)
                        break;
                }
 
-               if (token == "\\the_end") {
-                       lex.printError("\\the_end read in inset! Error in document!");
+               if (token == "\\end_document") {
+                       lex.printError("\\end_document read in inset! Error in document!");
                        return;
                }
 
@@ -362,21 +362,17 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
                first = 0;
        }
 
-       int yf = y_offset + first;
-       y = 0;
        int yo = y_offset + first;
 
-       paintRows2(*bv, text_, rit, end, x, y, yf, y2, yo);
+       paintRows(*bv, text_, rit, x, 0, yo, y2, yo);
 
        text_.clearPaint();
 
-       if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked)) {
+       if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked))
                drawFrame(pain, int(start_x));
-       }
 
-       if (need_update != INIT) {
+       if (need_update != INIT)
                need_update = NONE;
-       }
 }
 
 
@@ -795,11 +791,7 @@ void InsetText::lfunMouseMotion(FuncRequest const & cmd)
        if (cur == text_.cursor)
                return;
        text_.setSelection();
-       bool flag = (text_.toggle_cursor.par() != text_.toggle_end_cursor.par() ||
-                                text_.toggle_cursor.pos() != text_.toggle_end_cursor.pos());
-       if (flag) {
-               updateLocal(bv, SELECTION, false);
-       }
+       updateLocal(bv, SELECTION, false);
 }