Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / ImportLaTeX.C

diff --git a/src/ImportLaTeX.C b/src/ImportLaTeX.C
index 3c600a579fd8597c282771043fead129fea5c6fe..acafd3b822ff046f03786dd6738c297783bd792b 100644 (file)
--- a/src/ImportLaTeX.C
+++ b/src/ImportLaTeX.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  *           This file is Copyright 1998
  *           Asger Alstrup
@@ -23,7 +23,6 @@
 #include "support/filetools.h"
 #include "bufferlist.h"
 
-extern LyXRC * lyxrc;
 extern BufferList bufferlist;
 
 /*
@@ -39,12 +38,12 @@ ImportLaTeX::ImportLaTeX(string const & file)
 Buffer * ImportLaTeX::run()
 {
        // run reLyX
-       string tmp = lyxrc->relyx_command + " -f " + file;
+       string tmp = lyxrc.relyx_command + " -f " + file;
         Systemcalls one;
        Buffer * buf = 0;
        int result = one.startscript(Systemcalls::System, tmp);
        if (result == 0) {
-               string filename = ChangeExtension(file, ".lyx", false);
+               string filename = ChangeExtension(file, ".lyx");
                // File was generated without problems. Load it.
                buf = bufferlist.loadLyXFile(filename);
        }