couple more fixes

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 0bc17cc27d23a39a60193eb1398ffa3e292a44ba..03eb4002b92be0dc35a300a86a8c16468c248f9c 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -19,7 +19,7 @@
 #include "importer.h"
 #include "converter.h"
 #include "frontends/LyXView.h"
-#include "lyxfunc.h"
+#include "funcrequest.h"
 
 #include "bufferlist.h"
 #include "support/filetools.h"
@@ -40,7 +40,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
        string const displaypath = MakeDisplayPath(filename);
        ostringstream s1;
        s1 << _("Importing") << ' ' << displaypath << "...";
-       lv->message(s1.str().c_str());
+       lv->message(STRCONV(s1.str()));
 
        string const lyxfile = ChangeExtension(filename, ".lyx");
 
@@ -78,7 +78,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
                        : ChangeExtension(filename,
                                          formats.extension(loader_format));
                InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
-               lv->getLyXFunc().dispatch(LFUN_MARK_OFF);
+               lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }
 
        // we are done