Fixup e1be71da5: avoid duplication of layout

If the containing paragraph has kept its layout, reset the layout of
the first paragraph of the newly inserted inset.

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 313be9d88c052dd8da1c22b72489fe6589c845a6..94c6d13fbce23cb6c652dd046af6fe1b4ed17ff2 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -293,6 +293,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
        }
 
        bool gotsel = false;
+       bool move_layout = false;
        if (cur.selection()) {
                if (cmd.action() == LFUN_INDEX_INSERT)
                        copySelectionToTemp(cur);
@@ -303,8 +304,10 @@ static bool doInsertInset(Cursor & cur, Text * text,
                         * FIXME: this does not work as expected when change tracking is on
                         *   However, we do not really know what to do in this case.
                         */
-                       if (cur.paragraph().empty() && !inset->forcePlainLayout())
+                       if (cur.paragraph().empty() && !inset->forcePlainLayout()) {
                                cur.paragraph().setPlainOrDefaultLayout(bparams.documentClass());
+                               move_layout = true;
+                       }
                }
                cur.clearSelection();
                gotsel = true;
@@ -330,6 +333,11 @@ static bool doInsertInset(Cursor & cur, Text * text,
                inset_text->fixParagraphsFont();
                cur.pos() = 0;
                cur.pit() = 0;
+               /* If the containing paragraph has kept its layout, reset the
+                * layout of the first paragraph of the inset.
+                */
+               if (!move_layout)
+                       cur.paragraph().setPlainOrDefaultLayout(bparams.documentClass());
                // FIXME: what does this do?
                if (cmd.action() == LFUN_FLEX_INSERT)
                        return true;