cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index b4e135cc8b60c94f991e799bbd52beedfd50c5ea..d363a74ebe725c06229659f224397f7180e3bfed 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -26,6 +26,7 @@
 #include "BufferView.h"
 #include "buffer_funcs.h"
 
+using lyx::docstring;
 using lyx::support::bformat;
 using lyx::support::changeExtension;
 using lyx::support::makeDisplayPath;
@@ -39,9 +40,9 @@ extern BufferList bufferlist;
 
 
 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");
@@ -53,7 +54,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
                     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;