fix typo that put too many include paths for most people

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index 68922a87fd3356fe773bca1f7d13c0d636ce884b..7d9c2b3f09de64253175d85e765b5bade4fd5122 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -24,6 +24,7 @@
 #include "converter.h"
 #include "frontends/Alert.h"
 #include "gettext.h"
+#include "BufferView.h"
 
 using std::vector;
 using std::find;
@@ -31,6 +32,18 @@ using std::find;
 bool Exporter::Export(Buffer * buffer, string const & format,
                      bool put_in_tempdir, string & result_file)
 {
+       // There are so many different places that this function can be called
+       // from that the removal of auto insets is best done here.  This ensures
+       // we always have a clean buffer for inserting errors found during export.
+       BufferView * bv = buffer->getUser();
+       if (bv) {
+               // Remove all error insets
+               if (bv->removeAutoInsets()) {
+                       bv->redraw();
+                       bv->fitCursor();
+               }
+       }
+
        string backend_format;
        vector<string> backends = Backends(buffer);
        if (find(backends.begin(), backends.end(), format) == backends.end()) {
@@ -56,7 +69,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
        string filename = buffer->getLatexName(false);
        if (!buffer->tmppath.empty())
                filename = AddName(buffer->tmppath, filename);
-       filename = ChangeExtension(filename, 
+       filename = ChangeExtension(filename,
                                   formats.extension(backend_format));
 
        // Ascii backend
@@ -64,19 +77,19 @@ bool Exporter::Export(Buffer * buffer, string const & format,
                buffer->writeFileAscii(filename, lyxrc.ascii_linelen);
        // Linuxdoc backend
        else if (buffer->isLinuxDoc())
-               buffer->makeLinuxDocFile(filename, true);
+               buffer->makeLinuxDocFile(filename, !put_in_tempdir);
        // Docbook backend
        else if (buffer->isDocBook())
-               buffer->makeDocBookFile(filename, true);
+               buffer->makeDocBookFile(filename, !put_in_tempdir);
        // LaTeX backend
        else if (backend_format == format)
                buffer->makeLaTeXFile(filename, string(), true);
-       else if (contains(buffer->filepath, ' ')) {
+       else if (contains(buffer->filePath(), ' ')) {
                Alert::alert(_("Cannot run latex."),
                           _("The path to the lyx file cannot contain spaces."));
                return false;
        } else
-               buffer->makeLaTeXFile(filename, buffer->filepath, false);
+               buffer->makeLaTeXFile(filename, buffer->filePath(), false);
 
        string outfile_base = (put_in_tempdir)
                ? filename : buffer->getLatexName(false);
@@ -125,7 +138,7 @@ vector<Format const *> const
 Exporter::GetExportableFormats(Buffer const * buffer, bool only_viewable)
 {
        vector<string> backends = Backends(buffer);
-       vector<Format const *> result = 
+       vector<Format const *> result =
                converters.getReachable(backends[0], only_viewable, true);
        for (vector<string>::const_iterator it = backends.begin() + 1;
             it != backends.end(); ++it) {