X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fimporter.C;h=672edcdc6e1e7713bde9654d3239a5dc83bb81b2;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=808ec9c39573f7ec7dec4fdd7ca34ddb18a0f84b;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/importer.C b/src/importer.C
index 808ec9c395..672edcdc6e 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,17 +1,20 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file importer.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "importer.h"
 #include "converter.h"
+#include "format.h"
 #include "frontends/LyXView.h"
 #include "funcrequest.h"
 
@@ -21,12 +24,14 @@
 #include "gettext.h"
 #include "BufferView.h"
 
-#include "BoostFormat.h"
-
-#include <algorithm>
+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);
@@ -36,13 +41,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
 		      string const & format)
 {
 	string const displaypath = MakeDisplayPath(filename);
-	ostringstream s1;
-#if USE_BOOST_FORMAT
-	s1 << boost::format(_("Importing %1$s...")) % displaypath;
-#else
-	s1 << _("Importing ") << displaypath << _("...");
-#endif
-	lv->message(STRCONV(s1.str()));
+	lv->message(bformat(_("Importing %1$s..."), displaypath));
 
 	string const lyxfile = ChangeExtension(filename, ".lyx");
 
@@ -60,15 +59,9 @@ bool Importer::Import(LyXView * lv, string const & filename,
 			}
 		}
 		if (loader_format.empty()) {
-#if USE_BOOST_FORMAT
-			Alert::alert(_("Cannot import file"),
-				     boost::io::str(boost::format(_("No information for importing from %1$s"))
-				   % formats.prettyName(format)));
-#else
-			Alert::alert(_("Cannot import file"),
-				     _("No information for importing from ")
-				     + formats.prettyName(format));
-#endif
+			Alert::error(_("Couldn't import file"),
+				     bformat(_("No information for importing the format %1$s."),
+				         formats.prettyName(format)));
 			return false;
 		}
 	} else
@@ -76,11 +69,9 @@ bool Importer::Import(LyXView * lv, string const & filename,
 
 
 	if (loader_format == "lyx") {
-		Buffer * buffer = bufferlist.loadLyXFile(lyxfile);
-		if (buffer)
-			lv->view()->buffer(buffer);
+		lv->view()->loadLyXFile(lyxfile);
 	} else {
-		lv->view()->buffer(bufferlist.newFile(lyxfile, string(), true));
+		lv->view()->newFile(lyxfile, string(), true);
 		bool as_paragraphs = loader_format == "textparagraph";
 		string filename2 = (loader_format == format) ? filename
 			: ChangeExtension(filename,