* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetwrap.C

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 13f1831a5745ce22deb9e42fb5a8e229e77f79d9..570802c50d70b6371f71452d6cf531b577cd2b32 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -28,7 +28,7 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 #include "paragraph.h"
-#include "pariterator.h"
+#include "TocBackend.h"
 
 #include "support/convert.h"
 
@@ -54,7 +54,7 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
        setLabelFont(font);
        params_.type = type;
        params_.width = LyXLength(50, LyXLength::PCW);
-       setInsetName(type);
+       setInsetName(from_utf8(type));
 }
 
 
@@ -224,7 +224,7 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetWrap::addToToc(toc::TocList & toclist, Buffer const & buf) const
+void InsetWrap::addToToc(TocList & toclist, Buffer const & buf) const
 {
        ParConstIterator pit = par_const_iterator_begin(*this);
        ParConstIterator end = par_const_iterator_end(*this);
@@ -232,12 +232,11 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const & buf) const
        // Find a caption layout in one of the (child inset's) pars
        for (; pit != end; ++pit) {
                if (pit->layout()->labeltype == LABEL_SENSITIVE) {
-                       string const type = params_.type;
+                       Toc & toc = toclist[params_.type];
                        docstring const str =
-                               convert<docstring>(toclist[type].size() + 1)
+                               convert<docstring>(toc.size() + 1)
                                + ". " + pit->asString(buf, false);
-                       toc::TocItem const item(pit, 0, str);
-                       toclist[type].push_back(item);
+                       toc.push_back(TocItem(pit, 0, str));
                }
        }
 }