Since we're now caching this, we can sort it once, rather than

lots of times.

(cherry picked from commit 7fd1a14c1b048b0b0f92239e84d0b3397a2fde24)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 8e799353d0ff523d829a903e8fb9115397b647eb..3e4c2161e9c2c24a0948031408d48dd0a806f984 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2436,6 +2436,7 @@ vector<Format const *> const & BufferParams::exportableFormats(bool only_viewabl
                        theConverters().getReachable(*it, only_viewable, false, excludes);
                result.insert(result.end(), r.begin(), r.end());
        }
+       sort(result.begin(), result.end(), Format::formatSorter);
        cached = result;
        valid = true;
        return cached;

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 382aa969c35f6962de66aa3abe7a8142d53d696f..742d033b068859fa2943ac93ca89fdd61c94b0ed 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -2545,11 +2545,9 @@ void GuiDocument::updateDefaultFormat()
        outputModule->defaultFormatCO->clear();
        outputModule->defaultFormatCO->addItem(qt_("Default"),
                                QVariant(QString("default")));
-       typedef vector<Format const *> Formats;
-       Formats formats = param_copy.exportableFormats(true);
-       sort(formats.begin(), formats.end(), Format::formatSorter);
-       Formats::const_iterator cit = formats.begin();
-       Formats::const_iterator end = formats.end();
+       vector<Format const *> const & formats = param_copy.exportableFormats(true);
+       vector<Format const *>::const_iterator cit = formats.begin();
+       vector<Format const *>::const_iterator end = formats.end();
        for (; cit != end; ++cit)
                outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()),
                                QVariant(toqstr((*cit)->name())));

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 3dcdb3a0ae18f1fc89fd1d81001c47ac06cdef07..6a932e99d130c525c9e3d78222cc2849b023860b 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1055,7 +1055,6 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
                LATTEST(false);
                return;
        }
-       sort(formats.begin(), formats.end(), Format::formatSorter);
 
        bool const view_update = (kind == MenuItem::ViewFormats
                        || kind == MenuItem::UpdateFormats);