Do not use \&@#^_~$ as lstinline delimiter, as suggested by Herbert

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 9f42fa532aeebd859f4b6300ba3c4878c48abc6d..103721213ae5e278139cacf2b59d14bdd0cc3ea5 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -123,14 +123,10 @@ Toc const & TocBackend::toc(std::string const & type) const
 
 void TocBackend::updateItem(ParConstIterator const & par_it)
 {
-       if (toc("tableofcontents").empty()) {
-               // TODO should not happen, 
-               // a call to TocBackend::update() is missing somewhere
-               LYXERR(Debug::INFO)
-                               << "TocBackend.cpp: TocBackend::updateItem"
-                               << "called but the TOC is empty" << std::endl;
+       // TODO should not happen, 
+       // a call to TocBackend::update() is missing somewhere
+       if (toc("tableofcontents").empty())
                return;
-       }
 
        BufferParams const & bufparams = buffer_->params();
        const int min_toclevel = bufparams.getTextClass().min_toclevel();
@@ -212,15 +208,15 @@ void TocBackend::update()
                        // insert this into the table of contents
                        if (tocstring.empty())
                                tocstring = pit->asString(*buffer_, true);
-                       toc.push_back(
-                               TocItem(pit, toclevel - min_toclevel, tocstring));
+                       toc.push_back(TocItem(pit, toclevel - min_toclevel,
+                               tocstring));
                }
        }
 }
 
 
-TocIterator const TocBackend::item(
-       std::string const & type, ParConstIterator const & par_it) const
+TocIterator const TocBackend::item(std::string const & type,
+               ParConstIterator const & par_it) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
        // Is the type supported?
@@ -242,9 +238,15 @@ TocIterator const TocBackend::item(
                while (par_it_text.inMathed())
                        par_it_text.backwardPos();
 
-       for (; it != last; --it)
+       for (; it != last; --it) {
+               // We verify that we don't compare contents of two
+               // different document. This happens when you
+               // have parent and child documents.
+               if (&it->par_it_[0].inset() != &par_it_text[0].inset())
+                       continue;
                if (it->par_it_ <= par_it_text)
                        return it;
+       }
 
        // We are before the first Toc Item:
        return last;