X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fexporter.C;h=49a66b2f716b2689ab55b656e09e9e899aaa05db;hb=b0babedcb7a9f4c737540d8ac7007b12ff5d979b;hp=8cea7fd389807e3a73295cea54124bc7047d16a3;hpb=7abb718a67d2e0d263dbd713433cb6d060499cc0;p=lyx.git

diff --git a/src/exporter.C b/src/exporter.C
index 8cea7fd389..49a66b2f71 100644
--- 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.
  *
@@ -22,8 +22,9 @@
 #include "support/filetools.h"
 #include "lyxrc.h"
 #include "converter.h"
-#include "lyx_gui_misc.h" //WriteAlert
+#include "frontends/Alert.h"
 #include "gettext.h"
+#include "BufferView.h"
 
 using std::vector;
 using std::find;
@@ -31,6 +32,19 @@ 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()) {
+#warning repaint() or update() or nothing ?
+			bv->repaint();
+			bv->fitCursor();
+		}
+	}
+
 	string backend_format;
 	vector<string> backends = Backends(buffer);
 	if (find(backends.begin(), backends.end(), format) == backends.end()) {
@@ -45,7 +59,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
 			}
 		}
 		if (backend_format.empty()) {
-			WriteAlert(_("Cannot export file"),
+			Alert::alert(_("Cannot export file"),
 				   _("No information for exporting to ")
 				   + formats.prettyName(format));
 			return false;
@@ -56,7 +70,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 +78,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, ' ')) {
-		WriteAlert(_("Cannot run latex."),
+	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);
@@ -94,6 +108,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
 	return true;
 }
 
+
 bool Exporter::Export(Buffer * buffer, string const & format,
 		      bool put_in_tempdir)
 {
@@ -101,6 +116,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
 	return Export(buffer, format, put_in_tempdir, result_file);
 }
 
+
 bool Exporter::Preview(Buffer * buffer, string const & format)
 {
 	string result_file;
@@ -125,7 +141,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) {
@@ -149,6 +165,7 @@ string const Exporter::BufferFormat(Buffer const * buffer)
 		return "latex";
 }
 
+
 vector<string> const Exporter::Backends(Buffer const * buffer)
 {
 	vector<string> v;