[LyX/2.2.x] Since we're now caching this, we can sort it once, rather than lots of times.

[Richard Heck]

commit 1cdbf23d6932e0b142299db56a65df4d608cdbe2
Author: Richard Heck <rgh...@lyx.org>
Date:   Wed Oct 19 17:28:51 2016 -0400

    Since we're now caching this, we can sort it once, rather than
    lots of times.
    
    (cherry picked from commit 7fd1a14c1b048b0b0f92239e84d0b3397a2fde24)
---
 src/BufferParams.cpp              |    1 +
 src/frontends/qt4/GuiDocument.cpp |    8 +++-----
 src/frontends/qt4/Menus.cpp       |    1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 8e79935..3e4c216 100644
--- 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 382aa96..742d033 100644
--- 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 3dcdb3a..6a932e9 100644
--- 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);