Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator...

[lyx.git] / src / insets / InsetCaption.cpp

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index ea362e2adbc052b2b4fc7fc0b33cdb4a7a4ca3da..dafaddef13740068d36c337105285c0934db5542 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -70,11 +70,8 @@ void InsetCaption::read(Lexer & lex)
 #if 0
        // We will enably this check again when the compability
        // code is removed from Buffer::Read (Lgb)
-       string const token = lex.GetString();
-       if (token != "Caption") {
-               lyxerr << "InsetCaption::Read: consistency check failed."
-                      << endl;
-       }
+       lex.setContext("InsetCaption::Read: consistency check");
+       lex >> "Caption";
 #endif
        InsetText::read(lex);
 }
@@ -105,16 +102,16 @@ void InsetCaption::setCustomLabel(docstring const & label)
 }
 
 
-void InsetCaption::addToToc(ParConstIterator const & cpit) const
+void InsetCaption::addToToc(DocIterator const & cpit)
 {
        if (type_.empty())
                return;
 
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(*this));
 
        Toc & toc = buffer().tocBackend().toc(type_);
-       docstring const str = full_label_ + ". " + pit->asString(false);
+       docstring const str = full_label_ + ". " + text_.getPar(0).asString(false);
        toc.push_back(TocItem(pit, 0, str));
 }
 
@@ -273,6 +270,14 @@ int InsetCaption::getOptArg(odocstream & os,
 }
 
 
+int InsetCaption::getCaptionText(odocstream & os,
+                       OutputParams const & runparams) const
+{
+       os << full_label_ << ' ';
+       return InsetText::plaintext(os, runparams);
+}
+
+
 void InsetCaption::updateLabels(ParIterator const & it)
 {
        DocumentClass const & tclass = buffer().params().documentClass();