From: Richard Heck <rgheck@lyx.org>
Date: Wed, 19 Oct 2016 21:28:51 +0000 (-0400)
Subject: Since we're now caching this, we can sort it once, rather than
X-Git-Tag: 2.2.4~129
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1cdbf23d6932e0b142299db56a65df4d608cdbe2;p=features.git

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 8e799353d0..3e4c2161e9 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 382aa969c3..742d033b06 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 3dcdb3a0ae..6a932e99d1 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);