installer: further preparation

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index a94f16a0699ab201fef6d45ac274ce4082094918..70453620ac9251541b382b1614aa453fb365ed3e 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -148,7 +148,7 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
 #endif
                cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
 #ifdef ENABLE_ASSERTIONS
-               LASSERT(old_pos == cur.pos(), /**/);
+               LATTEST(old_pos == cur.pos());
 #endif
                cur.nextInset()->edit(cur, true);
                // don't do that also for LFUN_MATH_MODE
@@ -488,7 +488,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        // at the end?
        cur.noScreenUpdate();
 
-       LASSERT(cur.text() == this, /**/);
+       LBUFERR(this == cur.text());
        CursorSlice const oldTopSlice = cur.top();
        bool const oldBoundary = cur.boundary();
        bool const oldSelection = cur.selection();
@@ -648,12 +648,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                // provide it with two different cursors.
                                Cursor dummy = cur;
                                dummy.pos() = dummy.pit() = 0;
-                               if (cur.bv().checkDepm(dummy, cur)) {
+                               if (cur.bv().checkDepm(dummy, cur))
                                        cur.forceBufferUpdate();
-                                       // DEPM may have requested a screen update
-                                       cur.screenUpdateFlags(
-                                               cur.screenUpdate() | dummy.screenUpdate());
-                               }
                        }
                }
                break;
@@ -679,12 +675,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                Cursor dummy = cur;
                                dummy.pos() = cur.lastpos();
                                dummy.pit() = cur.lastpit();
-                               if (cur.bv().checkDepm(dummy, cur)) {
+                               if (cur.bv().checkDepm(dummy, cur))
                                        cur.forceBufferUpdate();
-                                       // DEPM may have requested a screen update
-                                       cur.screenUpdateFlags(
-                                               cur.screenUpdate() | dummy.screenUpdate());
-                               }
                        }
                }
                break;
@@ -867,12 +859,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                // provide it with two different cursors.
                                Cursor dummy = cur;
                                dummy.pos() = dummy.pit() = 0;
-                               if (cur.bv().checkDepm(dummy, cur)) {
+                               if (cur.bv().checkDepm(dummy, cur))
                                        cur.forceBufferUpdate();
-                                       // DEPM may have requested a screen update
-                                       cur.screenUpdateFlags(
-                                               cur.screenUpdate() | dummy.screenUpdate());
-                               }
                        }
                }
                break;
@@ -921,12 +909,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                Cursor dummy = cur;
                                dummy.pos() = cur.lastpos();
                                dummy.pit() = cur.lastpit();
-                               if (cur.bv().checkDepm(dummy, cur)) {
+                               if (cur.bv().checkDepm(dummy, cur))
                                        cur.forceBufferUpdate();
-                                       // DEPM may have requested a screen update
-                                       cur.screenUpdateFlags(
-                                               cur.screenUpdate() | dummy.screenUpdate());
-                               }
                        }
                }
                break;
@@ -1236,7 +1220,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_PASTE: {
                cur.message(_("Paste"));
-               LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), /**/);
+               LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), break);
                cap::replaceSelection(cur);
 
                // without argument?
@@ -1272,7 +1256,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        else if (arg == "wmf")
                                type = Clipboard::WmfGraphicsType;
                        else
-                               LASSERT(false, /**/);
+                               // We used to assert, but couldn't the argument come from, say, the
+                               // minibuffer and just be mistyped?
+                               LYXERR0("Unrecognized graphics type: " << arg);
 
                        pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type);
                }
@@ -1924,7 +1910,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                cap::replaceSelection(cur);
                cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
                checkAndActivateInset(cur, true);
-               LASSERT(cur.inMathed(), /**/);
+               LASSERT(cur.inMathed(), break);
                cur.dispatch(cmd);
                break;
        }
@@ -2375,7 +2361,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        FuncStatus & flag) const
 {
-       LASSERT(cur.text() == this, /**/);
+       LBUFERR(this == cur.text());
 
        FontInfo const & fontinfo = cur.real_current_font.fontInfo();
        bool enable = true;