* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / Toolbars.cpp

diff --git a/src/frontends/qt4/Toolbars.cpp b/src/frontends/qt4/Toolbars.cpp
index bd1c9af7639f41c9e2d6ad4888501ebec59edc07..f395e52a0a65b147859a54b7f698ceb1ad4a34de 100644 (file)
--- a/src/frontends/qt4/Toolbars.cpp
+++ b/src/frontends/qt4/Toolbars.cpp
@@ -154,7 +154,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
                                add(ToolbarItem(ToolbarItem::POPUPMENU, name, label));
                        }
                        break;
-               
+
                case TO_STICKYPOPUPMENU:
                        if (lex.next(true)) {
                                string const name = lex.getString();
@@ -210,7 +210,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
                                docstring const prettyname =
                                        from_utf8((*fit)->prettyname());
                                docstring tooltip;
-                               FuncCode lfun;
+                               FuncCode lfun = LFUN_NOACTION;
                                switch (code) {
                                case TO_EXPORTFORMATS:
                                        lfun = LFUN_BUFFER_EXPORT;
@@ -218,7 +218,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
                                        break;
                                case TO_IMPORTFORMATS:
                                        lfun = LFUN_BUFFER_IMPORT;
-                                       tooltip = _("Import %1$s ...");
+                                       tooltip = _("Import %1$s");
                                        break;
                                case TO_UPDATEFORMATS:
                                        lfun = LFUN_BUFFER_UPDATE;
@@ -358,6 +358,8 @@ void Toolbars::readToolbarSettings(Lexer & lex)
                                flag = RIGHT;
                        else if (!compare_ascii_no_case(*cit, "auto"))
                                flag = AUTO;
+                       else if (!compare_ascii_no_case(*cit, "samerow"))
+                               flag = SAMEROW;
                        else {
                                LYXERR(Debug::ANY,
                                        "Toolbars::readToolbarSettings: unrecognised token:`"