Change string

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 10a1a931c0ba66915db924727ab01a57a6042408..c2515a7529f3fb99fafa030665f94ad511fbfd9e 100644 (file)
--- 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.textClass().min_toclevel();
+       const int min_toclevel = bufparams.documentClass().min_toclevel();
 
        TocIterator toc_item = item("tableofcontents", par_it);
 
@@ -127,15 +130,15 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
                                *static_cast<InsetOptArg&>(inset).paragraphs().begin();
                        if (!toc_item->par_it_->labelString().empty())
                                tocstring = toc_item->par_it_->labelString() + ' ';
-                       tocstring += par.asString(*buffer_, false);
+                       tocstring += par.asString(false);
                        break;
                }
        }
 
-       int const toclevel = toc_item->par_it_->layout()->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;
 }
@@ -146,7 +149,7 @@ void TocBackend::update()
        tocs_.clear();
 
        BufferParams const & bufparams = buffer_->params();
-       const int min_toclevel = bufparams.textClass().min_toclevel();
+       const int min_toclevel = bufparams.documentClass().min_toclevel();
 
        Toc & toc = tocs_["tableofcontents"];
        ParConstIterator pit = buffer_->par_iterator_begin();
@@ -162,7 +165,8 @@ 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())
@@ -171,7 +175,7 @@ void TocBackend::update()
                                        *static_cast<InsetOptArg&>(inset).paragraphs().begin();
                                if (!pit->labelString().empty())
                                        tocstring = pit->labelString() + ' ';
-                               tocstring += par.asString(*buffer_, false);
+                               tocstring += par.asString(false);
                                break;
                        }
                        default:
@@ -180,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));
                }