another fix

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 79c528c1549907c9cae9ed24155f1e80a26506e9..685108a81bab1028e89f3188ce915fdb39c61d45 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -23,10 +23,8 @@
 #include "toc.h"
 #include "buffer.h"
 #include "frontends/LyXView.h"
-#include "lyxfunc.h"
 #include "LyXAction.h"
 #include "paragraph.h"
-#include "lyxtextclasslist.h"
 #include "insets/insetfloat.h"
 #include "debug.h"
 
@@ -35,8 +33,6 @@ using std::max;
 using std::endl;
 using std::ostream;
 
-extern LyXAction lyxaction;
-
 namespace toc
 {
 
@@ -45,11 +41,11 @@ string const TocItem::asString() const
        return string(4 * depth, ' ') + str;
 }
 
-       
+
 void TocItem::goTo(LyXView & lv_) const
 {
        string const tmp = tostr(par->id());
-       lv_.getLyXFunc()->dispatch(LFUN_GOTO_PARAGRAPH, tmp, false);
+       lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
 }
 
 
@@ -73,11 +69,11 @@ string const getType(string const & cmdName)
 TocList const getTocList(Buffer const * buf)
 {
        TocList toclist;
-       Paragraph * par = buf->paragraph;
+       if (!buf)
+               return toclist;
+       Paragraph * par = &*(buf->paragraphs.begin());
 
-       LyXTextClass const & textclass = textclasslist[buf->params.textclass];
-       bool found = textclass.hasLayout("Caption");
-       string const layout("Caption");
+       LyXTextClass const & textclass = buf->params.getLyXTextClass();
 
        while (par) {
 #ifdef WITH_WARNINGS
@@ -93,39 +89,17 @@ TocList const getTocList(Buffer const * buf)
                                           par->asString(buf, true));
                        toclist["TOC"].push_back(item);
                }
+
                // For each paragraph, traverse its insets and look for
                // FLOAT_CODE
-
-               if (found) {
-                       Paragraph::inset_iterator it =
-                               par->inset_iterator_begin();
-                       Paragraph::inset_iterator end =
-                               par->inset_iterator_end();
-
-                       for (; it != end; ++it) {
-                               if ((*it)->lyxCode() == Inset::FLOAT_CODE) {
-                                       InsetFloat * il =
-                                               static_cast<InsetFloat*>(*it);
-
-                                       string const type = il->type();
-
-                                       // Now find the caption in the float...
-                                       // We now tranverse the paragraphs of
-                                       // the inset...
-                                       Paragraph * tmp = il->inset.paragraph();
-                                       while (tmp) {
-                                               if (tmp->layout()->name() == layout) {
-                                                       string const str =
-                                                               tostr(toclist[type].size()+1) + ". " + tmp->asString(buf, false);
-                                                       TocItem const item(tmp, 0 , str);
-                                                       toclist[type].push_back(item);
-                                               }
-                                               tmp = tmp->next();
-                                       }
-                               }
+               InsetList::iterator it = par->insetlist.begin();
+               InsetList::iterator end = par->insetlist.end();
+               for (; it != end; ++it) {
+                       if (it.getInset()->lyxCode() == Inset::FLOAT_CODE) {
+                               InsetFloat * il =
+                                       static_cast<InsetFloat*>(it.getInset());
+                               il->addToToc(toclist, buf);
                        }
-               } else {
-                       lyxerr << "Caption not found" << endl;
                }
 
                par = par->next();
@@ -165,4 +139,3 @@ void asciiTocList(string const & type, Buffer const * buffer, ostream & os)
 
 
 } // namespace toc
-