#include "frontends/Alert.h"
#include "gettext.h"
#include "BufferView.h"
+#include "buffer_funcs.h"
using lyx::support::bformat;
using lyx::support::changeExtension;
bool Importer::Import(LyXView * lv, string const & filename,
- string const & format)
+ string const & format, ErrorList & errorList)
{
string const displaypath = makeDisplayPath(filename);
lv->message(bformat(_("Importing %1$s..."), displaypath));
it != loaders.end(); ++it) {
if (converters.isReachable(format, *it)) {
if (!converters.convert(0, filename, filename,
- format, *it))
+ format, *it, errorList))
return false;
loader_format = *it;
break;
if (loader_format == "lyx") {
- lv->view()->loadLyXFile(lyxfile);
+ lv->loadLyXFile(lyxfile);
} else {
- lv->view()->newFile(lyxfile, string(), true);
+ Buffer * const b = newFile(lyxfile, string(), true);
+ if (b)
+ lv->setBuffer(b);
+ else
+ return false;
bool as_paragraphs = loader_format == "textparagraph";
string filename2 = (loader_format == format) ? filename
: changeExtension(filename,