Add margin to paragraph dialog.

[lyx.git] / src / ToolbarBackend.C

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index b12fed44df1b0f956d33e2acc45285935a02072b..e737a9401636040ee6b267f6f3f78003e53d2ea5 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -79,12 +79,12 @@ void ToolbarBackend::read(LyXLex & lex)
        Toolbar tb;
        tb.name = lex.getString();
        lex.next(true);
-       if (!lex.isOK()) {
+       tb.gui_name = lex.getString();
+       if (!lex) {
                lyxerr << "ToolbarBackend::read: Malformed toolbar "
                        "description " <<  lex.getString() << endl;
                return;
        }
-       tb.gui_name = lex.getString();
 
        bool quit = false;
 
@@ -100,7 +100,7 @@ void ToolbarBackend::read(LyXLex & lex)
                                docstring const tooltip = translateIfPossible(lex.getDocString());
                                lex.next(true);
                                string const func_arg = lex.getString();
-                               lyxerr[Debug::PARSER]
+                               LYXERR(Debug::PARSER)
                                        << "ToolbarBackend::read TO_ADD func: `"
                                        << func_arg << '\'' << endl;
 
@@ -247,12 +247,12 @@ string const ToolbarBackend::getIcon(FuncRequest const & f)
        }
 
        if (!fullname.empty()) {
-               lyxerr[Debug::GUI] << "Full icon name is `"
+               LYXERR(Debug::GUI) << "Full icon name is `"
                                   << fullname << '\'' << endl;
                return fullname;
        }
 
-       lyxerr[Debug::GUI] << "Cannot find icon for command \""
+       LYXERR(Debug::GUI) << "Cannot find icon for command \""
                           << lyxaction.getActionName(f.action)
                           << '(' << to_utf8(f.argument()) << ")\"" << endl;
        return libFileSearch("images", "unknown", "xpm").absFilename();