Fix layout bug. Pasting text into a cell tried to set Standard layout, because

[lyx.git] / src / insets / InsetERT.cpp

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 137cc76a5f5437fadd00e1640f936b7dd06f9e3f..fd06239b1dd231dd04b8a92214d8d5c91246235a 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -22,12 +22,12 @@
 #include "FuncStatus.h"
 #include "Language.h"
 #include "Layout.h"
-#include "LyXAction.h"
 #include "Lexer.h"
-#include "TextClass.h"
+#include "LyXAction.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
 #include "Paragraph.h"
+#include "TextClass.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -104,7 +104,7 @@ int InsetERT::docbook(odocstream & os, OutputParams const &) const
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        BufferParams const & bp = cur.buffer().params();
-       Layout const layout = bp.documentClass().emptyLayout();
+       Layout const layout = bp.documentClass().plainLayout();
        //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
        switch (cmd.action) {
        case LFUN_QUOTE_INSERT: {
@@ -141,7 +141,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_PASTE:
                case LFUN_PRIMARY_SELECTION_PASTE:
                case LFUN_QUOTE_INSERT:
-                       status.enabled(true);
+                       status.setEnabled(true);
                        return true;
 
                // this one is difficult to get right. As a half-baked
@@ -192,26 +192,16 @@ bool InsetERT::showInsetDialog(BufferView * bv) const
 
 InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
 {
-       CollapseStatus status = Collapsed;
        if (in.empty())
-               return status;
-
+               return Collapsed;
        istringstream data(in);
        Lexer lex;
        lex.setStream(data);
-
-       string name;
-       lex >> name;
-       if (name != "ert") {
-               LYXERR0("Expected arg 1 to be \"ert\" in " << in);
-               return status;
-       }
-
+       lex.setContext("InsetERT::string2params");
+       lex >> "ert";
        int s;
        lex >> s;
-       if (lex)
-               status = static_cast<CollapseStatus>(s);
-       return status;
+       return static_cast<CollapseStatus>(s);
 }