From: Richard Heck <rgheck@lyx.org>
Date: Fri, 21 Oct 2016 02:56:40 +0000 (-0400)
Subject: These two routines are now redundant.
X-Git-Tag: 2.2.4~126
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f92744d18d4ec0be4e3fa216e0a9ee3673ea8fa2;p=features.git

These two routines are now redundant.

(cherry picked from commit c19794a01360a26824ddcabd82cde810e4d1867a)
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 94e94fa766..7b1f1698e3 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2527,7 +2527,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		size_t pos = format.find(' ');
 		if (pos != string::npos)
 			format = format.substr(0, pos);
-		enable = params().isExportable(format);
+		enable = params().isExportable(format, false);
 		if (!enable)
 			flag.message(bformat(
 					     _("Don't know how to export to format: %1$s"), arg));
@@ -2539,7 +2539,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		break;
 
 	case LFUN_BUILD_PROGRAM:
-		enable = params().isExportable("program");
+		enable = params().isExportable("program", false);
 		break;
 
 	case LFUN_BRANCH_ACTIVATE:
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 8af927ade3..a379e2740d 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2401,9 +2401,9 @@ string BufferParams::bufferFormat() const
 }
 
 
-bool BufferParams::isExportable(string const & format) const
+bool BufferParams::isExportable(string const & format, bool need_viewable) const
 {
-	FormatList const & formats = exportableFormats(false);
+	FormatList const & formats = exportableFormats(need_viewable);
 	FormatList::const_iterator fit = formats.begin();
 	FormatList::const_iterator end = formats.end();
 	for (; fit != end ; ++fit) {
@@ -2444,19 +2444,6 @@ FormatList const & BufferParams::exportableFormats(bool only_viewable) const
 }
 
 
-bool BufferParams::isExportableFormat(string const & format) const
-{
-	FormatList const & formats = exportableFormats(true);
-	FormatList::const_iterator fit = formats.begin();
-	FormatList::const_iterator end = formats.end();
-	for (; fit != end ; ++fit) {
-		if ((*fit)->name() == format)
-			return true;
-	}
-	return false;
-}
-
-
 vector<string> BufferParams::backends() const
 {
 	vector<string> v;
diff --git a/src/BufferParams.h b/src/BufferParams.h
index f4caa30100..4ae689401f 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -179,11 +179,9 @@ public:
 	OutputParams::FLAVOR getOutputFlavor(
 		  std::string const & format = std::string()) const;
 	///
-	bool isExportable(std::string const & format) const;
+	bool isExportable(std::string const & format, bool need_viewable) const;
 	///
 	std::vector<const Format *> const & exportableFormats(bool only_viewable) const;
-	///
-	bool isExportableFormat(std::string const & format) const;
 	/// the backends appropriate for use with this document.
 	/// so, e.g., latex is excluded , if we're using non-TeX fonts
 	std::vector<std::string> backends() const;
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 38f34332b9..8d8ca5916a 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1803,7 +1803,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		string format = to_utf8(cmd.argument());
 		if (cmd.argument().empty())
 			format = doc_buffer->params().getDefaultOutputFormat();
-		enable = doc_buffer->params().isExportableFormat(format);
+		enable = doc_buffer->params().isExportable(format, true);
 		break;
 	}
 
diff --git a/status.22x b/status.22x
index d3105f16f8..186a18898a 100644
--- a/status.22x
+++ b/status.22x
@@ -24,6 +24,8 @@ What's new
 
 - On Windows, allow to automatically bring the LyX window to top (bug 10469).
 
+- Cache information on exportable formats (bug 9980).
+
 
 * DOCUMENTATION AND LOCALIZATION