Keep dialog connected to cross-ref inset after Apply.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 43a2188c713c15234b6b5d302c9f75c694cb16cd..b3a36f1dd2f6100ba08d6827147bdedf702cf7ba 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -143,7 +143,7 @@ shared_ptr<Toc> TocBackend::toc(string const & type)
 
 TocBuilder & TocBackend::builder(string const & type)
 {
-       auto p = make_unique<TocBuilder>(toc(type));
+       auto p = lyx::make_unique<TocBuilder>(toc(type));
        return * builders_.insert(make_pair(type, move(p))).first->second;
 }
 
@@ -153,8 +153,11 @@ TocBuilder & TocBackend::builder(string const & type)
 // TocItem creation and update should be made in a dedicated function and
 // updateItem should be rewritten to uniformly update the matching items from
 // all TOCs.
-bool TocBackend::updateItem(DocIterator const & dit_in)
+bool TocBackend::updateItem(DocIterator const & dit_in) const
 {
+       if (dit_in.buffer() && dit_in.buffer()->isInternal())
+               return false;
+
        // we need a text
        DocIterator dit = dit_in.getInnerText();
 
@@ -180,7 +183,7 @@ bool TocBackend::updateItem(DocIterator const & dit_in)
        //
        // FIXME: This is supposed to accomplish the same as the body of
        // InsetText::iterateForToc(), probably
-       Paragraph & par = toc_item->dit().paragraph();
+       Paragraph const & par = toc_item->dit().paragraph();
        for (auto const & table : par.insetList())
                if (InsetArgument const * arg = table.inset->asInsetArgument()) {
                        tocstring = par.labelString();
@@ -291,7 +294,7 @@ void TocBackend::resetOutlinerNames()
        addName("brokenrefs", _("Broken References and Citations"));
        // Customizable, but the corresponding insets have no layout definition
        addName("child", _("Child Documents"));
-       addName("graphics", _("Graphics"));
+       addName("graphics", _("Graphics[[listof]]"));
        addName("equation", _("Equations"));
        addName("external", _("External Material"));
        addName("math-macro", _("Math Macros"));