Remove LyXToolBox

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 0d773918da3dde0f9aa0c8acac2e08c6544fc4a2..7641741076553a6b9a3131f0bddf1acdeb12a44d 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -912,6 +912,10 @@ int Buffer::readHeader(Lexer & lex)
        params().output_sync_macro.erase();
        params().setLocalLayout(docstring(), false);
        params().setLocalLayout(docstring(), true);
+       params().biblio_opts.erase();
+       params().biblatex_bibstyle.erase();
+       params().biblatex_citestyle.erase();
+       params().multibib.erase();
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -2031,7 +2035,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
                if (! tclass.class_header().empty())
                        os << from_ascii(tclass.class_header());
                else if (runparams.flavor == OutputParams::XML)
-                       os << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" "
+                       os << "PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\" "
                            << "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
                else
                        os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
@@ -4730,14 +4734,16 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
        ParIterator parit = cbuf.par_iterator_begin();
        updateBuffer(parit, utype);
 
+       /// FIXME: Perf
+       /// Update the tocBackend for any buffer. The outliner uses the master's,
+       /// and the navigation menu uses the child's.
+       cbuf.tocBackend().update(true, utype);
+
        if (master != this)
-               // TocBackend update will be done later.
                return;
 
        d->bibinfo_cache_valid_ = true;
        d->cite_labels_valid_ = true;
-       /// FIXME: Perf
-       cbuf.tocBackend().update(true, utype);
        if (scope == UpdateMaster)
                cbuf.structureChanged();
 }