Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index d537f33633e6f7b871cc2d74710e11bfb09960ef..a7186bc64f42691d61da2069a37b7bea82caf7d9 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -440,9 +440,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                needsUpdate |= cursorDownParagraph(cur);
                break;
 
-       case LFUN_SCREEN_UP:
        case LFUN_SCREEN_UP_SELECT:
-               needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
+               needsUpdate |= cur.selHandle(true);
                if (cur.pit() == 0 && cur.textRow().pos() == 0)
                        cur.undispatched();
                else {
@@ -450,9 +449,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                }
                break;
 
-       case LFUN_SCREEN_DOWN:
        case LFUN_SCREEN_DOWN_SELECT:
-               needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
+               needsUpdate |= cur.selHandle(true);
                if (cur.pit() == cur.lastpit()
                          && cur.textRow().endpos() == cur.lastpos())
                        cur.undispatched();
@@ -574,13 +572,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_BREAK_PARAGRAPH:
                cap::replaceSelection(cur);
-               breakParagraph(cur, 0);
+               breakParagraph(cur, false);
                cur.resetAnchor();
                break;
 
        case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
                cap::replaceSelection(cur);
-               breakParagraph(cur, 1);
+               breakParagraph(cur, true);
                cur.resetAnchor();
                break;
 
@@ -591,7 +589,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.pos() == 0)
                        cur.paragraph().params().labelWidthString(docstring());
                else
-                       breakParagraph(cur, 0);
+                       breakParagraph(cur, false);
                cur.resetAnchor();
                break;
        }
@@ -1202,12 +1200,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                recordUndo(cur);
                cur.clearSelection();
                insertInset(cur, inset);
-               inset->edit(cur, true);
                // Show the dialog for the nomenclature entry, since the
                // description entry still needs to be filled in.
                if (cmd.action == LFUN_NOMENCL_INSERT)
-                       InsetCommandMailer("nomenclature",
-                               *reinterpret_cast<InsetCommand *>(inset)).showDialog(&cur.bv());
+                       inset->edit(cur, true);
                cur.posRight();
                break;
        }
@@ -1855,8 +1851,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_WORD_SELECT:
        case LFUN_PARAGRAPH_UP:
        case LFUN_PARAGRAPH_DOWN:
-       case LFUN_SCREEN_UP:
-       case LFUN_SCREEN_DOWN:
        case LFUN_LINE_BEGIN:
        case LFUN_LINE_END:
        case LFUN_BREAK_LINE: