X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fimporter.C;h=b37c9f0cfa89e3db9c5ff4c051f277025e01a982;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=fc260837f056e6bf9d827b4834074b5020f4ef18;hpb=1a8665988f6038b6d886c0bc663c1753c880d7ca;p=lyx.git

diff --git a/src/importer.C b/src/importer.C
index fc260837f0..b37c9f0cfa 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -4,11 +4,12 @@
  * 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"
@@ -16,31 +17,35 @@
 #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 "buffer_funcs.h"
 
-#include <algorithm>
 
-using std::vector;
-using std::find;
+namespace lyx {
 
+using support::bformat;
+using support::changeExtension;
+using support::makeDisplayPath;
 
-extern BufferList bufferlist;
-extern void InsertAsciiFile(BufferView *, string const &, bool);
+using std::find;
+using std::string;
+using std::vector;
 
 
 bool Importer::Import(LyXView * lv, string const & filename,
-		      string const & format)
+		      string const & format, ErrorList & errorList)
 {
-	string const displaypath = MakeDisplayPath(filename);
+	docstring 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();
@@ -48,32 +53,40 @@ bool Importer::Import(LyXView * lv, string const & filename,
 		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))
+				string const tofile =
+					changeExtension(filename,
+						formats.extension(*it));
+				if (!converters.convert(0, filename, tofile,
+							filename, format, *it, errorList))
 					return false;
 				loader_format = *it;
 				break;
 			}
 		}
 		if (loader_format.empty()) {
-			Alert::error(_("Couldn't import file"),
+			frontend::Alert::error(_("Couldn't import file"),
 				     bformat(_("No information for importing the format %1$s."),
-				         formats.prettyName(format)));
+					 formats.prettyName(format)));
 			return false;
 		}
-	} else
+	} else {
 		loader_format = format;
+	}
 
 
 	if (loader_format == "lyx") {
-		lv->view()->loadLyXFile(lyxfile);
+		lv->loadLyXFile(lyxfile);
 	} else {
-		lv->view()->buffer(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,
+			: changeExtension(filename,
 					  formats.extension(loader_format));
-		InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+		insertAsciiFile(lv->view(), filename2, as_paragraphs);
 		lv->dispatch(FuncRequest(LFUN_MARK_OFF));
 	}
 
@@ -106,3 +119,6 @@ vector<string> const Importer::Loaders()
 	v.push_back("textparagraph");
 	return v;
 }
+
+
+} // namespace lyx