Fix list of viewable formats in view/update menu.

Also fix list in (currently unused) Export toolbar button.

Fixes: #11044
(cherry picked from commit ab6bd5e3190e61fa46eb2fd057cdf7f71faf3f38)

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index d08517f00bf1ec4450c24b60e03338d092e4b320..4ced58975f2c3b50f3b4bedc50312b3b032f4752 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1123,7 +1123,7 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
                                add(MenuItem(MenuItem::Command, toqstr(lbl), FuncRequest(action)));
                                continue;
                        }
-               // fall through
+                       break;
                case MenuItem::ExportFormats:
                        if (!f->inExportMenu())
                                continue;

diff --git a/src/frontends/qt4/Toolbars.cpp b/src/frontends/qt4/Toolbars.cpp
index 2e15775d0ab739b0007942081e1466636bef5a28..b43d61acf28959278accc334ed804f351bc6e97b 100644 (file)
--- a/src/frontends/qt4/Toolbars.cpp
+++ b/src/frontends/qt4/Toolbars.cpp
@@ -194,9 +194,13 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
                case TO_IMPORTFORMATS:
                case TO_UPDATEFORMATS:
                case TO_VIEWFORMATS: {
-                       FormatList formats = (code == TO_IMPORTFORMATS) ?
-                               theConverters().importableFormats() :
-                               theConverters().exportableFormats(true);
+                       FormatList formats;
+                       if (code == TO_IMPORTFORMATS)
+                               formats = theConverters().importableFormats();
+                       else if (code == TO_EXPORTFORMATS)
+                               formats = theConverters().exportableFormats(false);
+                       else
+                               formats = theConverters().exportableFormats(true);
                        sort(formats.begin(), formats.end());
                        for (Format const * f : formats) {
                                if (f->dummy())

diff --git a/status.23x b/status.23x
index 42bc947d4d474cd7e8b0f8cbe4a0cb8720816cf6..407f06c703763f42bc0c1f9cd9ad536e4267fb2b 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -60,6 +60,8 @@ What's new
 - When entering a math macro name, Escape properly cancels the
   operation (bug 9251).
 
+- Fix list of viewable formats in view/update menu (bug 11044).
+
 
 * INTERNALS