X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=a66b307d5d9e3e7595a42d71847fc904d8f2cc4c;hb=77713af55868140483a1a7f5704dd93b97dbe116;hp=519994038096a3d07a3f4bd8de5715a921c2bb05;hpb=ed42a06abb38d476700ee46ee4da92e6a07c8fba;p=lyx.git diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index 5199940380..a66b307d5d 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -25,7 +25,7 @@ #include "ParIterator.h" #include "TextClass.h" -#include "insets/InsetOptArg.h" +#include "insets/InsetArgument.h" #include "support/convert.h" #include "support/debug.h" @@ -44,8 +44,8 @@ namespace lyx { // /////////////////////////////////////////////////////////////////////////// -TocItem::TocItem(DocIterator const & dit, int d, docstring const & s) - : dit_(dit), depth_(d), str_(s) +TocItem::TocItem(DocIterator const & dit, int d, docstring const & s, + docstring const & t) : dit_(dit), depth_(d), str_(s), tooltip_(t) { } @@ -68,6 +68,12 @@ docstring const & TocItem::str() const } +docstring const & TocItem::tooltip() const +{ + return tooltip_; +} + + docstring const TocItem::asString() const { return docstring(4 * depth_, ' ') + str_; @@ -136,11 +142,11 @@ bool TocBackend::updateItem(DocIterator const & dit) InsetList::const_iterator end = par.insetList().end(); for (; it != end; ++it) { Inset & inset = *it->inset; - if (inset.lyxCode() == OPTARG_CODE) { + if (inset.lyxCode() == ARG_CODE) { if (!tocstring.empty()) break; Paragraph const & inset_par = - *static_cast(inset).paragraphs().begin(); + *static_cast(inset).paragraphs().begin(); if (!par.labelString().empty()) tocstring = par.labelString() + ' '; tocstring += inset_par.asString(AS_STR_INSETS); @@ -163,8 +169,10 @@ bool TocBackend::updateItem(DocIterator const & dit) void TocBackend::update() { tocs_.clear(); - DocIterator dit; - buffer_->inset().addToToc(dit); + if (!buffer_->isInternal()) { + DocIterator dit; + buffer_->inset().addToToc(dit); + } }