Fix natbib bug spotted by JMarc.

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 685108a81bab1028e89f3188ce915fdb39c61d45..15f2481d922546448f2c5439e619115f79adc461 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -26,7 +26,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;
@@ -71,11 +73,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
@@ -91,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) {
@@ -99,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;
 }