X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fimporter.C;h=3e6ccf69e09c3aa9f1ef4dafb818e27504864371;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=8d6894e9bcd8e6a12d2805f1422ea5f6feac2a17;hpb=986da292f8c6797ea47d49fc2fbb22a9687b758e;p=lyx.git

diff --git a/src/importer.C b/src/importer.C
index 8d6894e9bc..3e6ccf69e0 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,37 +1,37 @@
-/* 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
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
-#include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "importer.h"
 #include "converter.h"
+#include "format.h"
 #include "frontends/LyXView.h"
 #include "funcrequest.h"
 
 #include "bufferlist.h"
+#include "buffer_funcs.h"
 #include "support/filetools.h"
 #include "frontends/Alert.h"
 #include "gettext.h"
 #include "BufferView.h"
 
-#include "BoostFormat.h"
-
 #include <algorithm>
 
+using namespace lyx::support;
+
 using std::vector;
 using std::find;
 
+
 extern BufferList bufferlist;
 extern void InsertAsciiFile(BufferView *, string const &, bool);
 
@@ -40,13 +40,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");
 
@@ -64,15 +58,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
@@ -80,11 +68,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()->buffer(newFile(lyxfile, string(), true));
 		bool as_paragraphs = loader_format == "textparagraph";
 		string filename2 = (loader_format == format) ? filename
 			: ChangeExtension(filename,