header

[features.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index a25bce28d3ede0a8c9d8ab1e91a37a664e0dd728..0f2f4d89d2404773c68e31c04803263d1c3eed33 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -12,7 +12,6 @@
 
 #include <config.h>
 
-#include "BaseClassList.h"
 #include "buffer_funcs.h"
 #include "Buffer.h"
 #include "BufferList.h"
@@ -23,7 +22,6 @@
 #include "Floating.h"
 #include "FloatList.h"
 #include "InsetList.h"
-#include "InsetIterator.h"
 #include "Language.h"
 #include "LaTeX.h"
 #include "Layout.h"
@@ -294,7 +292,7 @@ bool needEnumCounterReset(ParIterator const & it)
 // set the label of a paragraph. This includes the counters.
 void setLabel(Buffer const & buf, ParIterator & it)
 {
-       TextClass const & textclass = buf.params().textClass();
+       DocumentClass const & textclass = buf.params().documentClass();
        Paragraph & par = it.paragraph();
        LayoutPtr const & layout = par.layout();
        Counters & counters = textclass.counters();
@@ -469,10 +467,9 @@ void updateLabels(Buffer const & buf, ParIterator & parit)
                InsetList::const_iterator end = parit->insetList().end();
                for (; iit != end; ++iit) {
                        parit.pos() = iit->pos;
-                       iit->inset->updateLabels(buf, parit);
+                       iit->inset->updateLabels(parit);
                }
        }
-       
 }
 
 
@@ -482,7 +479,7 @@ void updateLabels(Buffer const & buf, bool childonly)
 {
        Buffer const * const master = buf.masterBuffer();
        // Use the master text class also for child documents
-       TextClass const & textclass = master->params().textClass();
+       DocumentClass const & textclass = master->params().documentClass();
 
        if (!childonly) {
                // If this is a child document start with the master
@@ -493,6 +490,7 @@ void updateLabels(Buffer const & buf, bool childonly)
 
                // start over the counters
                textclass.counters().reset();
+               buf.clearReferenceCache();
        }
 
        Buffer & cbuf = const_cast<Buffer &>(buf);