Remove todo

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 1926ed988b5927e9b6376aeb16282dbdbabad9e8..2779f7700fbf87ddec39b530333e5cf99242214a 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -517,6 +517,8 @@ int Buffer::readHeader(Lexer & lex)
                errorList.push_back(ErrorItem(_("Document header error"),
                        s, -1, 0, 0));
        }
+       
+       params().makeTextClass();
 
        return unknown_tokens;
 }
@@ -542,14 +544,6 @@ bool Buffer::readDocument(Lexer & lex)
        BOOST_ASSERT(paragraphs().empty());
 
        readHeader(lex);
-       TextClass const & baseClass = textclasslist[params().getBaseClass()];
-       if (!baseClass.load(filePath())) {
-               string theclass = baseClass.name();
-               Alert::error(_("Can't load document class"), bformat(
-                       _("Using the default document class, because the "
-                                    "class %1$s could not be loaded."), from_utf8(theclass)));
-               params().setBaseClass(defaultTextclass());
-       }
 
        if (params().outputChanges) {
                bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
@@ -678,6 +672,8 @@ bool Buffer::readFile(FileName const & filename)
                FileName lyxfile(addName(temppath(), "content.lyx"));
                // if both manifest.txt and file.lyx exist, this is am embedded file
                if (lyxfile.exists()) {
+                       // if in bundled format, save checksum of the compressed file, not content.lyx
+                       saveCheckSum(filename);
                        params().embedded = true;
                        fname = lyxfile;
                }
@@ -914,20 +910,19 @@ bool Buffer::writeFile(FileName const & fname) const
        }
 
        removeAutosaveFile(d->filename.absFilename());
+
+       if (params().embedded) {
+               message(str + _(" writing embedded files!."));
+               // if embedding is enabled, write file.lyx and all the embedded files
+               // to the zip file fname.
+               if (!d->embedded_files.writeFile(fname)) {
+                       message(str + _(" could not write embedded files!."));
+                       return false;
+               }
+       }
        saveCheckSum(d->filename);
        message(str + _(" done."));
 
-       if (!params().embedded)
-               return true;
-
-       message(str + _(" writing embedded files!."));
-       // if embedding is enabled, write file.lyx and all the embedded files
-       // to the zip file fname.
-       if (!d->embedded_files.writeFile(fname)) {
-               message(str + _(" could not write embedded files!."));
-               return false;
-       }
-       message(str + _(" error while writing embedded files."));
        return true;
 }
 
@@ -1209,7 +1204,6 @@ void Buffer::makeDocBookFile(FileName const & fname,
 {
        LYXERR(Debug::LATEX, "makeDocBookFile...");
 
-       //ofstream ofs;
        odocfstream ofs;
        if (!openFileWrite(ofs, fname))
                return;