X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=c2515a7529f3fb99fafa030665f94ad511fbfd9e;hb=700af7e7011f102d92222744791638ff2db18f94;hp=adc4d89b236b4c704750396c32805829f947535d;hpb=c3a8b3a566e9e90f9ade72acbc723232d721d0b1;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index adc4d89b23..c2515a7529 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -30,8 +30,11 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 
+#include <boost/assert.hpp>
+
 using namespace std;
 
+
 namespace lyx {
 
 ///////////////////////////////////////////////////////////////////////////
@@ -108,7 +111,7 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
 	}
 
 	BufferParams const & bufparams = buffer_->params();
-	const int min_toclevel = bufparams.getTextClass().min_toclevel();
+	const int min_toclevel = bufparams.documentClass().min_toclevel();
 
 	TocIterator toc_item = item("tableofcontents", par_it);
 
@@ -125,18 +128,17 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
 				break;
 			Paragraph const & par =
 				*static_cast<InsetOptArg&>(inset).paragraphs().begin();
-			if (!toc_item->par_it_->getLabelstring().empty())
-				tocstring = toc_item->par_it_->getLabelstring() + ' ';
-			tocstring += par.asString(*buffer_, false);
+			if (!toc_item->par_it_->labelString().empty())
+				tocstring = toc_item->par_it_->labelString() + ' ';
+			tocstring += par.asString(false);
 			break;
 		}
 	}
 
-	int const toclevel = toc_item->par_it_->layout()->toclevel;
-	if (toclevel != Layout::NOT_IN_TOC
-	    && toclevel >= min_toclevel
+	int const toclevel = toc_item->par_it_->layout().toclevel;
+	if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
 		&& tocstring.empty())
-			tocstring = toc_item->par_it_->asString(*buffer_, true);
+			tocstring = toc_item->par_it_->asString(true);
 
 	const_cast<TocItem &>(*toc_item).str_ = tocstring;
 }
@@ -147,7 +149,7 @@ void TocBackend::update()
 	tocs_.clear();
 
 	BufferParams const & bufparams = buffer_->params();
-	const int min_toclevel = bufparams.getTextClass().min_toclevel();
+	const int min_toclevel = bufparams.documentClass().min_toclevel();
 
 	Toc & toc = tocs_["tableofcontents"];
 	ParConstIterator pit = buffer_->par_iterator_begin();
@@ -163,16 +165,17 @@ void TocBackend::update()
 		InsetList::const_iterator end = pit->insetList().end();
 		for (; it != end; ++it) {
 			Inset & inset = *it->inset;
-			inset.addToToc(*buffer_, pit);
+			//lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
+			inset.addToToc(pit);
 			switch (inset.lyxCode()) {
 			case OPTARG_CODE: {
 				if (!tocstring.empty())
 					break;
 				Paragraph const & par =
 					*static_cast<InsetOptArg&>(inset).paragraphs().begin();
-				if (!pit->getLabelstring().empty())
-					tocstring = pit->getLabelstring() + ' ';
-				tocstring += par.asString(*buffer_, false);
+				if (!pit->labelString().empty())
+					tocstring = pit->labelString() + ' ';
+				tocstring += par.asString(false);
 				break;
 			}
 			default:
@@ -181,12 +184,12 @@ void TocBackend::update()
 		}
 
 		/// now the toc entry for the paragraph
-		int const toclevel = pit->layout()->toclevel;
+		int const toclevel = pit->layout().toclevel;
 		if (toclevel != Layout::NOT_IN_TOC
 		    && toclevel >= min_toclevel) {
 			// insert this into the table of contents
 			if (tocstring.empty())
-				tocstring = pit->asString(*buffer_, true);
+				tocstring = pit->asString(true);
 			toc.push_back(TocItem(pit, toclevel - min_toclevel,
 				tocstring));
 		}