Internal buffers are valid

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index fbb55fc706976f2914e0b3921c6a8d904d2e046e..0850363bc43f98d40f8004b7227a3572411855ec 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -32,6 +32,8 @@
 #include "OutputParams.h"
 #include "Paragraph.h"
 #include "ParIterator.h"
+#include "TexRow.h"
+#include "texstream.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
 #include "TocBackend.h"
@@ -51,11 +53,11 @@ namespace lyx {
 
 
 InsetCaption::InsetCaption(Buffer * buf, string const & type)
-    : InsetText(buf, InsetText::PlainLayout), 
+    : InsetText(buf, InsetText::PlainLayout),
       labelwidth_(0), is_subfloat_(false), type_(type)
 {
        setDrawFrame(true);
-       setFrameColor(Color_collapsableframe);
+       setFrameColor(Color_collapsibleframe);
 }
 
 
@@ -92,7 +94,7 @@ void InsetCaption::setCustomLabel(docstring const & label)
 
 
 void InsetCaption::addToToc(DocIterator const & cpit, bool output_active,
-                                                       UpdateType utype) const
+                                                       UpdateType utype, TocBackend & backend) const
 {
        string const & type = floattype_.empty() ? "senseless" : floattype_;
        DocIterator pit = cpit;
@@ -107,9 +109,9 @@ void InsetCaption::addToToc(DocIterator const & cpit, bool output_active,
                str = full_label_;
                text().forOutliner(str, length);
        }
-       buffer().tocBackend().builder(type).captionItem(pit, str, output_active);
+       backend.builder(type).captionItem(pit, str, output_active);
        // Proceed with the rest of the inset.
-       InsetText::addToToc(cpit, output_active, utype);
+       InsetText::addToToc(cpit, output_active, utype, backend);
 }
 
 
@@ -207,6 +209,8 @@ void InsetCaption::doDispatch(Cursor & cur, FuncRequest & cmd)
                        break;
                }
        }
+       // no "changetype":
+       // fall through
 
        default:
                InsetText::doDispatch(cur, cmd);
@@ -302,7 +306,7 @@ docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
                string const our_class = "float-caption-" + type_;
                size_t const loc = attr.find("class='");
                if (loc != string::npos)
-                       attr.insert(loc + 7, our_class+ " ");
+                       attr.insert(loc + 7, our_class + " ");
                else
                        attr = attr + " class='" + our_class + "'";
        }
@@ -320,7 +324,7 @@ void InsetCaption::getArgument(otexstream & os,
 
        if (!il.leftdelim().empty())
                os << il.leftdelim();
- 
+
        OutputParams rp = runparams;
        if (isPassThru())
                rp.pass_thru = true;