X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=c95616907a2f6cb9069eba5f97be1f34fceac521;hb=821e2764074c58791988e220ffa774fea926959a;hp=c33d64f21fe7113998cc2261d3c1e0326b507a92;hpb=ac08e89095af413817b08b538a4ed8cb0eabbfdd;p=lyx.git

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index c33d64f21f..c95616907a 100644
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -22,12 +22,14 @@
 
 #include "frontends/alert.h"
 
+#include "support/ExceptionMessage.h"
 #include "support/debug.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Package.h"
 
+#include <boost/assert.hpp>
 #include <boost/bind.hpp>
 
 #include <algorithm>
@@ -35,29 +37,11 @@
 
 using boost::bind;
 
-using std::auto_ptr;
-using std::endl;
-using std::equal_to;
-using std::find;
-using std::find_if;
-using std::for_each;
-using std::string;
-using std::vector;
-using std::back_inserter;
-using std::transform;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addName;
-using support::bformat;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::removeAutosaveFile;
-using support::package;
-using support::prefixIs;
-
 namespace Alert = lyx::frontend::Alert;
 
 
@@ -111,7 +95,18 @@ void BufferList::release(Buffer * buf)
 
 Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 {
-	auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
+	auto_ptr<Buffer> tmpbuf;
+	try {
+		tmpbuf.reset(new Buffer(s, ronly));
+	} catch (ExceptionMessage const & message) {
+		if (message.type_ == ErrorException) {
+			Alert::error(message.title_, message.details_);
+			exit(1);
+		} else if (message.type_ == WarningException) {
+			Alert::warning(message.title_, message.details_);
+			return 0;
+		}
+	}
 	tmpbuf->params().useClassDefaults();
 	LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
 	bstore.push_back(tmpbuf.get());
@@ -216,24 +211,23 @@ void BufferList::emergencyWriteAll()
 }
 
 
-void BufferList::emergencyWrite(Buffer * buf)
+docstring BufferList::emergencyWrite(Buffer * buf)
 {
 	// Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert
 	// compare with 0 to avoid pointer/interger comparison
 	// ::assert(buf != 0);
 	if (!buf)
-		return;
+		return _("No file open!");
 
 	// No need to save if the buffer has not changed.
 	if (buf->isClean())
-		return;
+		return docstring();
 
 	string const doc = buf->isUnnamed()
 		? onlyFilename(buf->absFileName()) : buf->absFileName();
 
-	lyxerr << to_utf8(
-		bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc)))
-		<< endl;
+	docstring user_message = bformat(
+		_("LyX: Attempting to save document %1$s\n"), from_utf8(doc));
 
 	// We try to save three places:
 	// 1) Same place as document. Unless it is an unnamed doc.
@@ -243,10 +237,10 @@ void BufferList::emergencyWrite(Buffer * buf)
 		lyxerr << "  " << s << endl;
 		if (buf->writeFile(FileName(s))) {
 			buf->markClean();
-			lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
-			return;
+			user_message += _("  Save seems successful. Phew.\n");
+			return user_message;
 		} else {
-			lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
+			user_message += _("  Save failed! Trying...\n");
 		}
 	}
 
@@ -256,11 +250,11 @@ void BufferList::emergencyWrite(Buffer * buf)
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(FileName(s))) {
 		buf->markClean();
-		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
-		return;
+		user_message += _("  Save seems successful. Phew.\n");
+		return user_message;
 	}
 
-	lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
+	user_message += _("  Save failed! Trying...\n");
 
 	// 3) In "/tmp" directory.
 	// MakeAbsPath to prepend the current
@@ -270,10 +264,12 @@ void BufferList::emergencyWrite(Buffer * buf)
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(FileName(s))) {
 		buf->markClean();
-		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
-		return;
+		user_message += _("  Save seems successful. Phew.\n");
+		return user_message;
 	}
-	lyxerr << to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
+
+	user_message += _("  Save failed! Bummer. Document is lost.");
+	return user_message;
 }
 
 
@@ -328,11 +324,11 @@ void BufferList::setCurrentAuthor(docstring const & name, docstring const & emai
 }
 
 
-int BufferList::bufferNum(std::string const & name) const
+int BufferList::bufferNum(string const & name) const
 {
 	vector<string> buffers = getFileNames();
 	vector<string>::const_iterator cit =
-		std::find(buffers.begin(), buffers.end(), name);
+		find(buffers.begin(), buffers.end(), name);
 	if (cit == buffers.end())
 		return 0;
 	return int(cit - buffers.begin());