mathed uglyfication

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 6ce183334128ba4384a24c5c692d14bd7734f995..f9080e0143187bc4f0109cf78f2cf9e27e385a7a 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -14,6 +14,7 @@
 #include "toc.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "funcrequest.h"
 #include "iterators.h"
 #include "LyXAction.h"
@@ -29,6 +30,7 @@
 using std::vector;
 using std::max;
 using std::ostream;
+using std::string;
 
 namespace lyx {
 namespace toc {
@@ -46,10 +48,9 @@ void TocItem::goTo(LyXView & lv_) const
 }
 
 
-int TocItem::action() const
+FuncRequest TocItem::action() const
 {
-       return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
-                                        tostr(id_));
+       return FuncRequest(LFUN_GOTO_PARAGRAPH, tostr(id_));
 }
 
 
@@ -68,22 +69,15 @@ TocList const getTocList(Buffer const & buf)
        TocList toclist;
 
        BufferParams const & bufparams = buf.params();
-       LyXTextClass const & textclass = bufparams.getLyXTextClass();
 
        ParConstIterator pit = buf.par_iterator_begin();
        ParConstIterator end = buf.par_iterator_end();
        for (; pit != end; ++pit) {
-#ifdef WITH_WARNINGS
-#warning bogus type (Lgb)
-#endif
-               char const labeltype = pit->layout()->labeltype;
-
-               if (labeltype >= LABEL_COUNTER_CHAPTER
-                   && labeltype <= LABEL_COUNTER_CHAPTER + bufparams.tocdepth) {
-                               // insert this into the table of contents
-                       const int depth = max(0, labeltype - textclass.maxcounter());
-                       TocItem const item(pit->id(), depth,
-                                          pit->asString(buf, true));
+
+               int const toclevel = pit->layout()->toclevel;
+               if (toclevel > 0 &&  toclevel <= bufparams.tocdepth) {
+                       // insert this into the table of contents
+                       TocItem const item(pit->id(), toclevel - 1, pit->asString(buf, true));
                        toclist["TOC"].push_back(item);
                }