Revert 23154.

[lyx.git] / src / ToolbarBackend.cpp

diff --git a/src/ToolbarBackend.cpp b/src/ToolbarBackend.cpp
index b5c7d40574c4b83c4658593181cfd2962d9617d2..34f3d5bac1d28a7e9e22a39f6333ff509a07630d 100644 (file)
--- a/src/ToolbarBackend.cpp
+++ b/src/ToolbarBackend.cpp
@@ -14,24 +14,20 @@
 #include "ToolbarBackend.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "LyXAction.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
-#include <algorithm>
+#include "support/debug.h"
+#include "support/gettext.h"
 
-namespace lyx {
+#include <boost/bind.hpp>
 
-using support::compare_ascii_no_case;
-using support::getVectorFromString;
+#include <algorithm>
 
-using std::make_pair;
-using std::string;
-using std::vector;
-using std::find_if;
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
 namespace {
 
@@ -301,6 +297,8 @@ void ToolbarBackend::readToolbarSettings(Lexer & lex)
                                flag = ToolbarInfo::MATH;
                        else if (!compare_ascii_no_case(*cit, "table"))
                                flag = ToolbarInfo::TABLE;
+                       else if (!compare_ascii_no_case(*cit, "mathmacrotemplate"))
+                               flag = ToolbarInfo::MATHMACROTEMPLATE;
                        else if (!compare_ascii_no_case(*cit, "review"))
                                flag = ToolbarInfo::REVIEW;
                        else if (!compare_ascii_no_case(*cit, "top"))
@@ -311,6 +309,8 @@ void ToolbarBackend::readToolbarSettings(Lexer & lex)
                                flag = ToolbarInfo::LEFT;
                        else if (!compare_ascii_no_case(*cit, "right"))
                                flag = ToolbarInfo::RIGHT;
+                       else if (!compare_ascii_no_case(*cit, "auto"))
+                               flag = ToolbarInfo::AUTO;
                        else {
                                LYXERR(Debug::ANY,
                                        "ToolbarBackend::readToolbarSettings: unrecognised token:`"