* src/insets/InsetTabular.h:

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

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 68147e20d5386065bc185928adfee2964e6879cb..a25db23df222ad7eb32a94791560ae5f9f3c4ac3 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"
@@ -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(0,0);
+       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);
 }