Include the recently added test files in package

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 2b3e9c81013b225fec76fd213da9dde23303b61b..656f326e15c956aef9495823e5d6ef97f8261800 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_;
 }
 
 
@@ -149,7 +149,7 @@ bool TocBackend::updateItem(DocIterator const & dit)
                                *static_cast<InsetArgument&>(inset).paragraphs().begin();
                        if (!par.labelString().empty())
                                tocstring = par.labelString() + ' ';
-                       tocstring += inset_par.asString(AS_STR_INSETS | AS_STR_INTOC);
+                       tocstring += inset_par.asString(AS_STR_INSETS);
                        break;
                }
        }
@@ -157,7 +157,7 @@ bool TocBackend::updateItem(DocIterator const & dit)
        int const toclevel = par.layout().toclevel;
        if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
                && tocstring.empty())
-                       tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS | AS_STR_INTOC);
+                       tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
 
        const_cast<TocItem &>(*toc_item).str_ = tocstring;