remove noload/don't typeset

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 59b943a07d3687d49dbc219f2523d50d8c439ac9..f70b2295ace2ca359379ed7caccac04ff0d0ba2a 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"
@@ -77,8 +77,8 @@ bool Importer::Import(LyXView * lv, string const & filename,
                string filename2 = (loader_format == format) ? filename
                        : ChangeExtension(filename,
                                          formats.extension(loader_format));
-               InsertAsciiFile(lv->view(), filename2, as_paragraphs);
-               lv->getLyXFunc()->dispatch(LFUN_MARK_OFF);
+               InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+               lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }
 
        // we are done
@@ -87,19 +87,6 @@ bool Importer::Import(LyXView * lv, string const & filename,
 }
 
 
-#if 0
-bool Importer::IsImportable(string const & format)
-{
-       vector<string> loaders = Loaders();
-       for (vector<string>::const_iterator it = loaders.begin();
-            it != loaders.end(); ++it)
-               if (converters.IsReachable(format, *it))
-                       return true;
-       return false;
-}
-#endif
-
-
 vector<Format const *> const Importer::GetImportableFormats()
 {
        vector<string> loaders = Loaders();