X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=e3dcca1d0e59a201b268d397f91f9772561e2aa2;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=a66b307d5d9e3e7595a42d71847fc904d8f2cc4c;hpb=8480d1dd9af6f3d403ea42e2b891d38dd3ce2509;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index a66b307d5d..e3dcca1d0e 100644
--- 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);