anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 02:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

These two routines are now redundant.

Browse Source 
(cherry picked from commit c19794a013)
This commit is contained in:
Richard Heck 2016-10-20 22:56:40 -04:00
parent 348c95d1bf
commit f92744d18d
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Buffer.cpp
View File

@ -2527,7 +2527,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
size_t pos = format.find(' '); size_t pos = format.find(' ');
if (pos != string::npos) if (pos != string::npos)
format = format.substr(0, pos); format = format.substr(0, pos);
enable = params().isExportable(format); enable = params().isExportable(format, false);
if (!enable) if (!enable)
flag.message(bformat( flag.message(bformat(
_("Don't know how to export to format: %1$s"), arg)); _("Don't know how to export to format: %1$s"), arg));
@ -2539,7 +2539,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
break; break;
case LFUN_BUILD_PROGRAM: case LFUN_BUILD_PROGRAM:
enable = params().isExportable("program"); enable = params().isExportable("program", false);
break; break;
case LFUN_BRANCH_ACTIVATE: case LFUN_BRANCH_ACTIVATE:

17
src/BufferParams.cpp
View File

@ -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 fit = formats.begin();
FormatList::const_iterator end = formats.end(); FormatList::const_iterator end = formats.end();
for (; fit != end ; ++fit) { 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> BufferParams::backends() const
{ {
vector<string> v; vector<string> v;

4
src/BufferParams.h
View File

@ -179,11 +179,9 @@ public:
OutputParams::FLAVOR getOutputFlavor( OutputParams::FLAVOR getOutputFlavor(
std::string const & format = std::string()) const; 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; 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. /// the backends appropriate for use with this document.
/// so, e.g., latex is excluded , if we're using non-TeX fonts /// so, e.g., latex is excluded , if we're using non-TeX fonts
std::vector<std::string> backends() const; std::vector<std::string> backends() const;

2
src/frontends/qt4/GuiView.cpp
View File

@ -1803,7 +1803,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
string format = to_utf8(cmd.argument()); string format = to_utf8(cmd.argument());
if (cmd.argument().empty()) if (cmd.argument().empty())
format = doc_buffer->params().getDefaultOutputFormat(); format = doc_buffer->params().getDefaultOutputFormat();
enable = doc_buffer->params().isExportableFormat(format); enable = doc_buffer->params().isExportable(format, true);
break; break;
} }

2
status.22x
View File

@ -24,6 +24,8 @@ What's new
- On Windows, allow to automatically bring the LyX window to top (bug 10469). - On Windows, allow to automatically bring the LyX window to top (bug 10469).
- Cache information on exportable formats (bug 9980).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION