X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloat.C;h=523602e99361a87d2c99d5aaa6e250bb88961eca;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=0ba647db477d004ce7744eb4217a98d363d45368;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 0ba647db47..523602e993 100644
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -29,13 +29,11 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 #include "paragraph.h"
-#include "pariterator.h"
+#include "TocBackend.h"
 
 #include "support/lstrings.h"
 #include "support/convert.h"
 
-#include <sstream>
-
 
 namespace lyx {
 
@@ -127,7 +125,7 @@ InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
 	font.setColor(LColor::collapsable);
 	setLabelFont(font);
 	params_.type = type;
-	setInsetName(type);
+	setInsetName(from_utf8(type));
 }
 
 
@@ -378,7 +376,7 @@ void InsetFloat::sideways(bool s, BufferParams const & bp)
 }
 
 
-void InsetFloat::addToToc(toc::TocList & toclist, Buffer const & buf) const
+void InsetFloat::addToToc(TocList & toclist, Buffer const & buf) const
 {
 	ParConstIterator pit = par_const_iterator_begin(*this);
 	ParConstIterator end = par_const_iterator_end(*this);
@@ -386,12 +384,12 @@ void InsetFloat::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));
+			return;
 		}
 	}
 }