Provide proper fallback if a bibliography processor is not found

[lyx.git] / src / Text2.cpp

diff --git a/src/Text2.cpp b/src/Text2.cpp
index a16a270432583205c2765fe68ff653662b33faaf..3a7ca6cd9d003da42dea70c87bf77eaa697960c2 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -182,10 +182,11 @@ void Text::setLayout(pit_type start, pit_type end,
 
        for (pit_type pit = start; pit != end; ++pit) {
                Paragraph & par = pars_[pit];
-               // Is this a separating paragraph?
+               // Is this a separating paragraph? If so,
+               // this needs to be standard layout
                bool const is_separator = par.size() == 1
                                && par.isEnvSeparator(0);
-               par.applyLayout(is_separator ? bp.documentClass().plainLayout() : lyxlayout);
+               par.applyLayout(is_separator ? bp.documentClass().defaultLayout() : lyxlayout);
                if (lyxlayout.margintype == MARGIN_MANUAL)
                        par.setLabelWidthString(par.expandLabel(lyxlayout, bp));
        }
@@ -924,6 +925,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
                if (cur.depth() >= old.depth()) {
                        CursorSlice & curslice = cur[old.depth() - 1];
                        if (&curslice.inset() == &old.inset()
+                           && curslice.idx() == old.idx()
                            && curslice.pit() > old.pit()) {
                                --curslice.pit();
                                // since a paragraph has been deleted, all the