using support::bformat;
using support::changeExtension;
+using support::FileName;
using support::makeDisplayPath;
using std::find;
using std::vector;
-bool Importer::Import(LyXView * lv, string const & filename,
+bool Importer::Import(LyXView * lv, FileName const & filename,
string const & format, ErrorList & errorList)
{
- docstring const displaypath = makeDisplayPath(filename);
+ docstring const displaypath = makeDisplayPath(filename.absFilename());
lv->message(bformat(_("Importing %1$s..."), displaypath));
- string const lyxfile = changeExtension(filename, ".lyx");
+ FileName const lyxfile(changeExtension(filename.absFilename(), ".lyx"));
string loader_format;
vector<string> loaders = Loaders();
for (vector<string>::const_iterator it = loaders.begin();
it != loaders.end(); ++it) {
if (converters.isReachable(format, *it)) {
- if (!converters.convert(0, filename, filename,
- format, *it, errorList))
+ string const tofile =
+ changeExtension(filename.absFilename(),
+ formats.extension(*it));
+ if (!converters.convert(0, filename, FileName(tofile),
+ filename, format, *it, errorList))
return false;
loader_format = *it;
break;
if (loader_format == "lyx") {
lv->loadLyXFile(lyxfile);
} else {
- Buffer * const b = newFile(lyxfile, string(), true);
+ Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
if (b)
lv->setBuffer(b);
else
return false;
bool as_paragraphs = loader_format == "textparagraph";
- string filename2 = (loader_format == format) ? filename
- : changeExtension(filename,
+ string filename2 = (loader_format == format) ? filename.absFilename()
+ : changeExtension(filename.absFilename(),
formats.extension(loader_format));
insertAsciiFile(lv->view(), filename2, as_paragraphs);
lv->dispatch(FuncRequest(LFUN_MARK_OFF));