LaTeXFeatures.cpp: fix part of http://bugzilla.lyx.org/show_bug.cgi?id=5294 also...

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 17de467d144e63075a3c419f65b9145bb8cdf345..6ce5f4044bef194c450b62631464e963d7c51679 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -104,13 +104,16 @@ Toc & TocBackend::toc(string const & type)
 }
 
 
-void TocBackend::updateItem(DocIterator const & dit)
+bool TocBackend::updateItem(DocIterator const & dit)
 {
+       if (dit.paragraph().layout().toclevel == Layout::NOT_IN_TOC)
+               return false;
+
        if (toc("tableofcontents").empty()) {
                // FIXME: should not happen, 
                // a call to TocBackend::update() is missing somewhere
                LYXERR0("TocBackend::updateItem called but the TOC is empty!");
-               return;
+               return false;
        }
 
        BufferParams const & bufparams = buffer_->params();
@@ -145,6 +148,8 @@ void TocBackend::updateItem(DocIterator const & dit)
                        tocstring = par.asString(AS_STR_LABEL);
 
        const_cast<TocItem &>(*toc_item).str_ = tocstring;
+
+       return true;
 }
 
 
@@ -162,10 +167,14 @@ TocIterator TocBackend::item(string const & type,
        TocList::const_iterator toclist_it = tocs_.find(type);
        // Is the type supported?
        LASSERT(toclist_it != tocs_.end(), /**/);
+       return toclist_it->second.item(dit);
+}
 
-       Toc const & toc_vector = toclist_it->second;
-       TocIterator last = toc_vector.begin();
-       TocIterator it = toc_vector.end();
+
+TocIterator Toc::item(DocIterator const & dit) const
+{
+       TocIterator last = begin();
+       TocIterator it = end();
        if (it == last)
                return it;