Update my email and status.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index a66b307d5d9e3e7595a42d71847fc904d8f2cc4c..e3dcca1d0e59a201b268d397f91f9772561e2aa2 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -70,7 +70,7 @@ docstring const & TocItem::str() const
 
 docstring const & TocItem::tooltip() const
 {
-       return tooltip_;
+       return tooltip_.empty() ? str_ : tooltip_;
 }
 
 
@@ -118,7 +118,7 @@ Toc & TocBackend::toc(string const & type)
 
 bool TocBackend::updateItem(DocIterator const & dit)
 {
-       if (dit.paragraph().layout().toclevel == Layout::NOT_IN_TOC)
+       if (dit.text()->getTocLevel(dit.pit()) == Layout::NOT_IN_TOC)
                return false;
 
        if (toc("tableofcontents").empty()) {
@@ -154,7 +154,7 @@ bool TocBackend::updateItem(DocIterator const & dit)
                }
        }
 
-       int const toclevel = par.layout().toclevel;
+       int const toclevel = toc_item->dit_.text()->getTocLevel(toc_item->dit_.pit());
        if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
                && tocstring.empty())
                        tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);