* languages: use nb_NO instead of no_NO for norwegian (bug 2850).

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 4dd895084e444b8e30c82fb7c6812f6126aa6a8b..b37c9f0cfa89e3db9c5ff4c051f277025e01a982 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -17,33 +17,35 @@
 #include "format.h"
 #include "frontends/LyXView.h"
 #include "funcrequest.h"
+#include "lyx_cb.h"
 
-#include "bufferlist.h"
 #include "support/filetools.h"
+
 #include "frontends/Alert.h"
+
 #include "gettext.h"
 #include "BufferView.h"
+#include "buffer_funcs.h"
+
 
-using lyx::support::bformat;
-using lyx::support::ChangeExtension;
-using lyx::support::MakeDisplayPath;
+namespace lyx {
+
+using support::bformat;
+using support::changeExtension;
+using support::makeDisplayPath;
 
 using std::find;
 using std::string;
 using std::vector;
 
 
-extern BufferList bufferlist;
-extern void InsertAsciiFile(BufferView *, string const &, bool);
-
-
 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();
@@ -51,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)));
                        return false;
                }
-       } else
+       } else {
                loader_format = format;
+       }
 
 
        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,
+                       : 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));
        }
 
@@ -109,3 +119,6 @@ vector<string> const Importer::Loaders()
        v.push_back("textparagraph");
        return v;
 }
+
+
+} // namespace lyx