return from switch

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 2f6afd5be542e81637859f9c4d9fdd1a695bb29a..238736b126a8bd31c0a5e4871905c19b0cf9c683 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -384,7 +384,7 @@ static void outline(OutlineOp mode, Cursor & cur, Text * text)
        ParagraphList & pars = buf.text().paragraphs();
        ParagraphList::iterator const bgn = pars.begin();
        // The first paragraph of the area to be copied:
-       ParagraphList::iterator start = lyx::next(bgn, pit);
+       ParagraphList::iterator start = pars.iterator_at(pit);
        // The final paragraph of area to be copied:
        ParagraphList::iterator finish = start;
        ParagraphList::iterator const end = pars.end();
@@ -962,7 +962,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                ParagraphList & pars = buf.text().paragraphs();
                ParagraphList::iterator bgn = pars.begin();
                // The first paragraph of the area to be selected:
-               ParagraphList::iterator start = lyx::next(bgn, pit);
+               ParagraphList::iterator start = pars.iterator_at(pit);
                // The final paragraph of area to be selected:
                ParagraphList::iterator finish = start;
                ParagraphList::iterator end = pars.end();
@@ -2759,19 +2759,23 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                }
                break;
 
-       case LFUN_OUTLINE_UP:
+       case LFUN_OUTLINE_UP: {
+               pos_type const opos = cur.pos();
                outline(OutlineUp, cur, this);
-               setCursor(cur, cur.pit(), cur.pos());
+               setCursor(cur, cur.pit(), opos);
                cur.forceBufferUpdate();
                needsUpdate = true;
                break;
+       }
 
-       case LFUN_OUTLINE_DOWN:
+       case LFUN_OUTLINE_DOWN: {
+               pos_type const opos = cur.pos();
                outline(OutlineDown, cur, this);
-               setCursor(cur, cur.pit(), cur.pos());
+               setCursor(cur, cur.pit(), opos);
                cur.forceBufferUpdate();
                needsUpdate = true;
                break;
+       }
 
        case LFUN_OUTLINE_IN:
                outline(OutlineIn, cur, this);