adjust

[lyx.git] / src / Importer.cpp

diff --git a/src/Importer.cpp b/src/Importer.cpp
index ad609e47c13330ffcc4265b13599f0605314aabd..902df65e1ac60edb85901d4c1d701c1da8ca7349 100644 (file)
--- a/src/Importer.cpp
+++ b/src/Importer.cpp
@@ -17,7 +17,6 @@
 #include "Format.h"
 #include "frontends/LyXView.h"
 #include "FuncRequest.h"
-#include "callback.h"
 
 #include "support/filetools.h"
 
@@ -77,7 +76,15 @@ bool Importer::Import(LyXView * lv, FileName const & filename,
 
 
        if (loader_format == "lyx") {
-               lv->loadLyXFile(lyxfile);
+               Buffer * buf = lv->loadLyXFile(lyxfile);
+               if (!buf) {
+                       // we are done
+                       lv->message(_("file not imported!"));
+                       return false;
+               }
+               updateLabels(*buf);
+               lv->setBuffer(buf);
+               lv->showErrorList("Parse");
        } else {
                Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
                if (b)
@@ -88,7 +95,7 @@ bool Importer::Import(LyXView * lv, FileName const & filename,
                string filename2 = (loader_format == format) ? filename.absFilename()
                        : changeExtension(filename.absFilename(),
                                          formats.extension(loader_format));
-               insertPlaintextFile(lv->view(), filename2, as_paragraphs);
+               lv->view()->insertPlaintextFile(filename2, as_paragraphs);
                lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }