revert r37459 and add a note to the sources:

[lyx.git] / src / LayoutFile.cpp

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index e7e75d202149a36ae7292d2dccc17abeed1e3615..541f2dae84290c8f69c305a0c713fc53e66b4f85 100644 (file)
--- a/src/LayoutFile.cpp
+++ b/src/LayoutFile.cpp
@@ -104,7 +104,7 @@ bool LayoutFileList::read()
 
        if (real_file.empty()) {
                LYXERR0("LayoutFileList::Read: unable to find textclass file  "
-                   << "`textclass.lst'.";
+                   << "`textclass.lst'.");
        } else if (!lex.setFile(real_file)) {
                LYXERR0("LayoutFileList::Read: lyxlex was not able to set file: "
                       << real_file << '.');
@@ -218,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();
@@ -231,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())) {
@@ -315,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);
 }