fix some compiler warnings

[features.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 1e4d6fa272e750f454e2e29b9635cb54c945d2d4..d978e3f6e72e58189422641eb0b552b0c7cceea5 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -270,23 +270,24 @@ static void outline(OutlineOp mode, Cursor & cur)
 
        int const thistoclevel = start->layout()->toclevel;
        int toclevel;
+
+       // Move out (down) from this section header
+       if (finish != end)
+               ++finish;
+       // Seek the one (on same level) below
+       for (; finish != end; ++finish) {
+               toclevel = finish->layout()->toclevel;
+               if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) {
+                       break;
+               }
+       }
+
        switch (mode) {
                case OutlineUp: {
-                       // Move out (down) from this section header
-                       if (finish != end)
-                               ++finish;
-                       // Seek the one (on same level) below
-                       for (; finish != end; ++finish) {
-                               toclevel = finish->layout()->toclevel;
-                               if (toclevel != Layout::NOT_IN_TOC
-                                   && toclevel <= thistoclevel) {
-                                       break;
-                               }
-                       }
                        ParagraphList::iterator dest = start;
                        // Move out (up) from this header
                        if (dest == bgn)
-                               break;
+                               return;
                        // Search previous same-level header above
                        do {
                                --dest;
@@ -296,7 +297,7 @@ static void outline(OutlineOp mode, Cursor & cur)
                                    || toclevel > thistoclevel));
                        // Not found; do nothing
                        if (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)
-                               break;
+                               return;
                        pit_type const newpit = distance(bgn, dest);
                        pit_type const len = distance(start, finish);
                        pit_type const deletepit = pit + len;
@@ -305,30 +306,10 @@ static void outline(OutlineOp mode, Cursor & cur)
                        start = boost::next(pars.begin(), deletepit);
                        pit = newpit;
                        pars.erase(start, finish);
-                       break;
+                       return;
                }
                case OutlineDown: {
-                       // Go down out of current header:
-                       if (finish != end)
-                               ++finish;
-                       // Find next same-level header:
-                       for (; finish != end; ++finish) {
-                               toclevel = finish->layout()->toclevel;
-                               if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
-                                       break;
-                       }
                        ParagraphList::iterator dest = finish;
-                       // Go one down from *this* header:
-                       if (dest != end)
-                               ++dest;
-                       else
-                               break;
-                       // Go further down to find header to insert in front of:
-                       for (; dest != end; ++dest) {
-                               toclevel = dest->layout()->toclevel;
-                               if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
-                                       break;
-                       }
                        // One such was found:
                        pit_type newpit = distance(bgn, dest);
                        pit_type const len = distance(start, finish);
@@ -337,32 +318,44 @@ static void outline(OutlineOp mode, Cursor & cur)
                        start = boost::next(bgn, pit);
                        pit = newpit - len;
                        pars.erase(start, finish);
-                       break;
+                       return;
                }
-               case OutlineIn:
-                       buf.undo().recordUndo(cur);
-                       for (size_t i = 0; i != tc.layoutCount(); ++i) {
-                               LayoutPtr const & lt = tc.layout(i);
-                               if (lt->toclevel == thistoclevel + 1 &&
-                                   start->layout()->labeltype == lt->labeltype) {
-                                       start->setLayout(lt);
-                                       break;
+               case OutlineIn: {
+                       pit_type const len = distance(start, finish);
+                       buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
+                       for (; start != finish; ++start) {
+                               toclevel = start->layout()->toclevel;
+                               if (toclevel == Layout::NOT_IN_TOC)
+                                       continue;
+                               for (size_t i = 0; i != tc.layoutCount(); ++i) {
+                                       LayoutPtr const & lt = tc.layout(i);
+                                       if (lt->toclevel == toclevel + 1 &&
+                                           start->layout()->labeltype == lt->labeltype) {
+                                               start->setLayout(lt);
+                                               break;
+                                       }
                                }
                        }
-                       break;
-               case OutlineOut:
-                       buf.undo().recordUndo(cur);
-                       for (size_t i = 0; i != tc.layoutCount(); ++i) {
-                               LayoutPtr const & lt = tc.layout(i);
-                               if (lt->toclevel == thistoclevel - 1 &&
-                                   start->layout()->labeltype == lt->labeltype) {
-                                       start->setLayout(lt);
-                                       break;
+                       return;
+               }
+               case OutlineOut: {
+                       pit_type const len = distance(start, finish);
+                       buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
+                       for (; start != finish; ++start) {
+                               toclevel = start->layout()->toclevel;
+                               if (toclevel == Layout::NOT_IN_TOC)
+                                       continue;
+                               for (size_t i = 0; i != tc.layoutCount(); ++i) {
+                                       LayoutPtr const & lt = tc.layout(i);
+                                       if (lt->toclevel == toclevel - 1 &&
+                                               start->layout()->labeltype == lt->labeltype) {
+                                                       start->setLayout(lt);
+                                                       break;
+                                       }
                                }
                        }
-                       break;
-               default:
-                       break;
+                       return;
+               }
        }
 }
 
@@ -861,7 +854,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        */
                        if (cur.selection())
                                cutSelection(cur, true, false);
-                       insertInset(cur, inset);
+                       cur.insert(inset);
                        cur.posForward();
                }
                break;
@@ -942,7 +935,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        pasteFromStack(cur, bv->buffer().errorList("Paste"),
                                       convert<unsigned int>(arg));
                } else {
-                       Clipboard::GraphicsType type;
+                       Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
                        if (arg == "pdf")
                                type = Clipboard::PdfGraphicsType;
                        else if (arg == "png")
@@ -1114,15 +1107,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        else
                                c = par.getChar(pos - 1);
                        string arg = to_utf8(cmd.argument());
-                       InsetQuotes * iq;
                        if (arg == "single")
-                               iq = new InsetQuotes(c, bufparams.quotes_language,
-                                       InsetQuotes::SingleQ);
+                               cur.insert(new InsetQuotes(c,
+                                   bufparams.quotes_language,
+                                   InsetQuotes::SingleQ));
                        else
-                               iq = new InsetQuotes(c, bufparams.quotes_language,
-                                       InsetQuotes::DoubleQ);
-                       iq->setBuffer(bv->buffer());
-                       cur.insert(iq);
+                               cur.insert(new InsetQuotes(c,
+                                   bufparams.quotes_language,
+                                   InsetQuotes::DoubleQ));
                        cur.posForward();
                }
                else