Get rid of unused SessionInfoSection.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 17aab767c2c91c04b3a86a78533a7c5d97cd87da..d97ce3b307a329cee52d87259762f1e3ddfdef09 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -476,24 +476,37 @@ void updateLabels(Buffer const & buf, ParIterator & parit)
 // the contents of the paragraphs.
 void updateLabels(Buffer const & buf, bool childonly)
 {
-       Buffer const * const master = buf.masterBuffer();
        // Use the master text class also for child documents
+       Buffer const * const master = buf.masterBuffer();
        DocumentClass const & textclass = master->params().documentClass();
 
+       // keep the buffers to be children in this set. If the call from the
+       // master comes back we can see which of them were actually seen (i.e.
+       // via an InsetInclude). The remaining ones in the set need still be updated.
+       static std::set<Buffer const *> bufToUpdate;
        if (!childonly) {
                // If this is a child document start with the master
                if (master != &buf) {
+                       bufToUpdate.insert(&buf);
                        updateLabels(*master);
-                       return;
+
+                       // was buf referenced from the master (i.e. not in bufToUpdate anymore)?
+                       if (bufToUpdate.find(&buf) == bufToUpdate.end())
+                               return;
                }
 
-               // start over the counters
+               // start over the counters in the master
                textclass.counters().reset();
-               buf.clearReferenceCache();
-               buf.inset().setBuffer(const_cast<Buffer &>(buf));
-               buf.updateMacros();
        }
 
+       // update will be done below for buf
+       bufToUpdate.erase(&buf);
+
+       // update all caches
+       buf.clearReferenceCache();
+       buf.inset().setBuffer(const_cast<Buffer &>(buf));
+       buf.updateMacros();
+
        Buffer & cbuf = const_cast<Buffer &>(buf);
 
        BOOST_ASSERT(!buf.text().paragraphs().empty());