the spellcheck cleanup

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index be0f00c0cad3e7262b49a904711e4d99c80f8bae..5635facaa402ba1f98555c350f29ff7e2ded670f 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -21,6 +21,7 @@
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
+#include "dispatchresult.h"
 #include "factory.h"
 #include "funcrequest.h"
 #include "gettext.h"
@@ -259,7 +260,7 @@ void LyXText::cursorPrevious()
                return;
        }
 
-       setCursorFromCoordinates(cursor.x_fix(), y);
+       setCursorFromCoordinates(bv()->x_target(), y);
        finishUndo();
 
        if (crit == bv()->text->cursorRow()) {
@@ -312,7 +313,7 @@ void LyXText::cursorNext()
        Row const & rr = *getRowNearY(y, dummypit);
        y = dummypit->y + rr.y_offset();
 
-       setCursorFromCoordinates(cursor.x_fix(), y);
+       setCursorFromCoordinates(bv()->x_target(), y);
        // + bv->workHeight());
        finishUndo();
 
@@ -389,7 +390,7 @@ void doInsertInset(LyXText * lt, FuncRequest const & cmd,
 } // anon namespace
 
 
-dispatch_result LyXText::dispatch(FuncRequest const & cmd)
+DispatchResult LyXText::dispatch(FuncRequest const & cmd)
 {
        lyxerr[Debug::ACTION] << "LyXText::dispatch: action[" << cmd.action
                              <<"] arg[" << cmd.argument << ']' << "xy[" <<
@@ -720,10 +721,6 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
                                if (cursor.pos() == 0
                                    && !(params.spaceTop() == VSpace (VSpace::NONE))) {
                                        setParagraph(
-                                                params.lineTop(),
-                                                params.lineBottom(),
-                                                params.pagebreakTop(),
-                                                params.pagebreakBottom(),
                                                 VSpace(VSpace::NONE),
                                                 params.spaceBottom(),
                                                 params.spacing(),
@@ -768,10 +765,6 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
                        ParagraphParameters & params = cursorPar()->params();
                        if (cursor.pos() == 0 && !(params.spaceTop() == VSpace(VSpace::NONE))) {
                                setParagraph(
-                                        params.lineTop(),
-                                        params.lineBottom(),
-                                        params.pagebreakTop(),
-                                        params.pagebreakBottom(),
                                         VSpace(VSpace::NONE),
                                   params.spaceBottom(),
                                         params.spacing(),
@@ -816,10 +809,6 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
                        ParagraphParameters & params = getPar(cur)->params();
                        if (params.spaceTop() == VSpace(VSpace::NONE)) {
                                setParagraph(
-                                        params.lineTop(),
-                                        params.lineBottom(),
-                                        params.pagebreakTop(),
-                                        params.pagebreakBottom(),
                                         VSpace(VSpace::DEFSKIP), params.spaceBottom(),
                                         params.spacing(),
                                         params.align(),
@@ -993,14 +982,14 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
 
        case LFUN_BEGINNINGBUFSEL:
                if (inset_owner)
-                       return UNDISPATCHED;
+                       return DispatchResult(false);
                cursorTop();
                finishChange(bv, true);
                break;
 
        case LFUN_ENDBUFSEL:
                if (inset_owner)
-                       return UNDISPATCHED;
+                       return DispatchResult(false);
                cursorBottom();
                finishChange(bv, true);
                break;
@@ -1337,7 +1326,7 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
                        bv->text->setCursorFromCoordinates(x, y + screen_first);
                finishUndo();
                bv->text->selection.cursor = bv->text->cursor;
-               bv->text->cursor.x_fix(bv->text->cursor.x());
+               bv->x_target(bv->text->cursor.x());
 
                if (bv->fitCursor())
                        selection_possible = false;
@@ -1525,6 +1514,8 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
        case LFUN_INDEX_PRINT:
        case LFUN_TOC_INSERT:
        case LFUN_HFILL:
+       case LFUN_INSERT_LINE:
+       case LFUN_INSERT_PAGEBREAK:
                // do nothing fancy
                doInsertInset(this, cmd, false, false);
                break;
@@ -1543,8 +1534,8 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
                break;
 
        default:
-               return UNDISPATCHED;
+               return DispatchResult(false);
        }
 
-       return DISPATCHED;
+       return DispatchResult(true, true);
 }