* Licence details can be found in the file COPYING.
*
* \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
-
#include <config.h>
#include "importer.h"
#include "format.h"
#include "frontends/LyXView.h"
#include "funcrequest.h"
+#include "lyx_cb.h"
#include "bufferlist.h"
-#include "buffer_funcs.h"
#include "support/filetools.h"
#include "frontends/Alert.h"
#include "gettext.h"
#include "BufferView.h"
-#include <algorithm>
-
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::changeExtension;
+using lyx::support::makeDisplayPath;
-using std::vector;
using std::find;
+using std::string;
+using std::vector;
extern BufferList bufferlist;
-extern void InsertAsciiFile(BufferView *, string const &, bool);
bool Importer::Import(LyXView * lv, string const & filename,
string const & format)
{
- string const displaypath = MakeDisplayPath(filename);
+ string const displaypath = makeDisplayPath(filename);
lv->message(bformat(_("Importing %1$s..."), displaypath));
- string const lyxfile = ChangeExtension(filename, ".lyx");
+ string const lyxfile = changeExtension(filename, ".lyx");
string loader_format;
vector<string> loaders = Loaders();
if (loader_format.empty()) {
Alert::error(_("Couldn't import file"),
bformat(_("No information for importing the format %1$s."),
- formats.prettyName(format)));
+ formats.prettyName(format)));
return false;
}
} else
lv->view()->newFile(lyxfile, string(), true);
bool as_paragraphs = loader_format == "textparagraph";
string filename2 = (loader_format == format) ? filename
- : ChangeExtension(filename,
+ : changeExtension(filename,
formats.extension(loader_format));
- InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+ insertAsciiFile(lv->view().get(), filename2, as_paragraphs);
lv->dispatch(FuncRequest(LFUN_MARK_OFF));
}