diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp index 8aece21b81..dba8beb5fa 100644 --- a/src/frontends/qt4/GuiSendto.cpp +++ b/src/frontends/qt4/GuiSendto.cpp @@ -70,7 +70,7 @@ void GuiSendTo::changed_adaptor() void GuiSendTo::updateContents() { - all_formats_ = allFormats(); + all_formats_ = buffer().exportableFormats(false); // Save the current selection if any Format const * current_format = 0; @@ -165,59 +165,6 @@ void GuiSendTo::dispatchParams() dispatch(FuncRequest(getLfun(), data)); } -// FIXME: Move to Converters? -vector GuiSendTo::allFormats() const -{ - // What formats can we output natively? - vector exports; - exports.push_back("lyx"); - exports.push_back("text"); - - if (buffer().isLatex()) { - if (buffer().params().useXetex) - exports.push_back("xetex"); - else { - exports.push_back("latex"); - exports.push_back("pdflatex"); - } - } - else if (buffer().isDocBook()) - exports.push_back("docbook"); - else if (buffer().isLiterate()) - exports.push_back("literate"); - - // Loop over these native formats and ascertain what formats we - // can convert to - vector to; - - vector::const_iterator ex_it = exports.begin(); - vector::const_iterator ex_end = exports.end(); - for (; ex_it != ex_end; ++ex_it) { - // Start off with the native export format. - // "formats" is LyX's list of recognised formats - to.push_back(formats.getFormat(*ex_it)); - - Formats::const_iterator fo_it = formats.begin(); - Formats::const_iterator fo_end = formats.end(); - for (; fo_it != fo_end; ++fo_it) { - // we need to hide the default graphic export formats - // from the external menu, because we need them only - // for the internal lyx-view and external latex run - string const name = fo_it->name(); - if (name != "eps" && name != "xpm" && name != "png" && - theConverters().isReachable(*ex_it, name)) - to.push_back(&(*fo_it)); - } - } - - // Remove repeated formats. - sort(to.begin(), to.end()); - to.erase(unique(to.begin(), to.end()), to.end()); - - return to; -} - - Dialog * createGuiSendTo(GuiView & lv) { return new GuiSendTo(lv); } diff --git a/src/frontends/qt4/GuiSendto.h b/src/frontends/qt4/GuiSendto.h index 64284c180d..38f0f531a7 100644 --- a/src/frontends/qt4/GuiSendto.h +++ b/src/frontends/qt4/GuiSendto.h @@ -61,9 +61,6 @@ private: /// FuncCode getLfun() const { return LFUN_BUFFER_EXPORT_CUSTOM; } - /// Return a vector of those formats that can be exported from "lyx". - std::vector allFormats() const; - private: /// Format const * format_;