X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.cpp;h=541f2dae84290c8f69c305a0c713fc53e66b4f85;hb=13739f37d5208e87e97c44ef2eeba35807ddb9c5;hp=6f80c957968b3f1a992595a3042670b0fbeb297b;hpb=615d42d357e782a7d8c10c82e9e2833cc781f328;p=lyx.git

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index 6f80c95796..541f2dae84 100644
--- a/src/LayoutFile.cpp
+++ b/src/LayoutFile.cpp
@@ -103,10 +103,8 @@ bool LayoutFileList::read()
 	LYXERR(Debug::TCLASS, "Reading textclasses from `" << real_file << "'.");
 
 	if (real_file.empty()) {
-		LYXERR0("LayoutFileList::Read: unable to find textclass file  `"
-		    << makeDisplayPath(real_file.absFileName(), 1000)
-		    << "'.");
-		success = false;
+		LYXERR0("LayoutFileList::Read: unable to find textclass file  "
+		    << "`textclass.lst'.");
 	} else if (!lex.setFile(real_file)) {
 		LYXERR0("LayoutFileList::Read: lyxlex was not able to set file: "
 		       << real_file << '.');
@@ -220,7 +218,7 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
 	// stdclass.inc. That would give us something moderately usable.
 	ofs << "# This layout is automatically generated\n"
 	       "# \\DeclareLaTeXClass{" << textclass << "}\n\n"
-	       "Format 26\n"
+	       "Format " << LAYOUT_FORMAT << "\n"
 	       "Input stdclass.inc\n\n"
 	    << layoutpost;
 	ofs.close();
@@ -233,13 +231,12 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
 
 	if (!tc->load(tempLayout.absFileName())) {
 		// The only way this happens is because the hardcoded layout file 
-		// aboveis wrong or stdclass.inc cannot be found. So try again 
+		// above is wrong or stdclass.inc cannot be found. So try again 
 		// without stdclass.inc.
 		ofstream ofs2(tempLayout.toFilesystemEncoding().c_str());
 		ofs2 << "# This layout is automatically generated\n"
 		        "# \\DeclareLaTeXClass{" << textclass << "}\n\n"
-		        "Format 26\n"
-		        "Input stdclass.inc\n\n"
+		        "Format " << LAYOUT_FORMAT << "\n"
 		     << layoutpost;
 		ofs2.close();
 		if (!tc->load(tempLayout.absFileName())) {
@@ -317,13 +314,7 @@ bool LayoutFileList::load(string const & name, string const & buf_path)
 	}
 
 	LayoutFile * tc = classmap_[name];
-	if (!tc->load(buf_path)) {
-		docstring s = bformat(_("The document class %1$s "
-				   "could not be loaded."), from_utf8(name));
-		frontend::Alert::error(_("Could not load class"), s);
-		return false;
-	}
-	return true;
+	return tc->load(buf_path);
 }