Alfredo's second patch

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 685108a81bab1028e89f3188ce915fdb39c61d45..2db88e4af9ad6a52c04d9baf2ed63570e18d9a31 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -15,10 +15,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "support/lstrings.h"
 #include "toc.h"
 #include "buffer.h"
@@ -26,7 +22,9 @@
 #include "LyXAction.h"
 #include "paragraph.h"
 #include "insets/insetfloat.h"
+#include "insets/insetwrap.h"
 #include "debug.h"
+#include "iterators.h"
 
 using std::vector;
 using std::max;
@@ -44,7 +42,7 @@ string const TocItem::asString() const
 
 void TocItem::goTo(LyXView & lv_) const
 {
-       string const tmp = tostr(par->id());
+       string const tmp = tostr(id_);
        lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
 }
 
@@ -52,7 +50,7 @@ void TocItem::goTo(LyXView & lv_) const
 int TocItem::action() const
 {
        return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
-                                        tostr(par->id()));
+                                        tostr(id_));
 }
 
 
@@ -71,11 +69,14 @@ TocList const getTocList(Buffer const * buf)
        TocList toclist;
        if (!buf)
                return toclist;
-       Paragraph * par = &*(buf->paragraphs.begin());
 
        LyXTextClass const & textclass = buf->params.getLyXTextClass();
 
-       while (par) {
+       ParConstIterator pit = buf->par_iterator_begin();
+       ParConstIterator end = buf->par_iterator_end();
+       for (; pit != end; ++pit) {
+               Paragraph const * par = *pit;
+
 #ifdef WITH_WARNINGS
 #warning bogus type (Lgb)
 #endif
@@ -85,13 +86,13 @@ TocList const getTocList(Buffer const * buf)
                    && labeltype <= LABEL_COUNTER_CHAPTER + buf->params.tocdepth) {
                                // insert this into the table of contents
                        const int depth = max(0, labeltype - textclass.maxcounter());
-                       TocItem const item(par, depth,
+                       TocItem const item(par->id(), depth,
                                           par->asString(buf, true));
                        toclist["TOC"].push_back(item);
                }
 
                // For each paragraph, traverse its insets and look for
-               // FLOAT_CODE
+               // FLOAT_CODE or WRAP_CODE
                InsetList::iterator it = par->insetlist.begin();
                InsetList::iterator end = par->insetlist.end();
                for (; it != end; ++it) {
@@ -99,10 +100,12 @@ TocList const getTocList(Buffer const * buf)
                                InsetFloat * il =
                                        static_cast<InsetFloat*>(it.getInset());
                                il->addToToc(toclist, buf);
+                       } else if (it.getInset()->lyxCode() == Inset::WRAP_CODE) {
+                               InsetWrap * il =
+                                       static_cast<InsetWrap*>(it.getInset());
+                               il->addToToc(toclist, buf);
                        }
                }
-
-               par = par->next();
        }
        return toclist;
 }