Fix natbib bug spotted by JMarc.

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index a4e2e30167ab9b9b0d89d6bbcd88afb5f46ccbcb..15f2481d922546448f2c5439e619115f79adc461 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -23,11 +23,12 @@
 #include "toc.h"
 #include "buffer.h"
 #include "frontends/LyXView.h"
-#include "lyxfunc.h"
 #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;
@@ -46,7 +47,7 @@ string const TocItem::asString() const
 void TocItem::goTo(LyXView & lv_) const
 {
        string const tmp = tostr(par->id());
-       lv_.getLyXFunc()->dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
+       lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
 }
 
 
@@ -72,11 +73,14 @@ TocList const getTocList(Buffer const * buf)
        TocList toclist;
        if (!buf)
                return toclist;
-       Paragraph * par = buf->paragraph;
 
        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
@@ -92,7 +96,7 @@ TocList const getTocList(Buffer const * buf)
                }
 
                // 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) {
@@ -100,10 +104,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;
 }