Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 21b834aac50031e0d38ebe67203adf1a12db28c3..613249b6b25c28472c2134cbaf795e6ccc58153d 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,7 +53,8 @@ namespace lyx {
 
 
 InsetCaption::InsetCaption(Buffer * buf, string const & type)
-    : InsetText(buf, InsetText::PlainLayout), type_(type)
+    : InsetText(buf, InsetText::PlainLayout), 
+      labelwidth_(0), is_subfloat_(false), type_(type)
 {
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
@@ -106,7 +109,7 @@ 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);
+       buffer().tocBackend().builder(type).captionItem(pit, str, output_active);
        // Proceed with the rest of the inset.
        InsetText::addToToc(cpit, output_active, utype);
 }
@@ -224,7 +227,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
                if (first_arg == "changetype") {
                        string const type = cmd.getArg(1);
                        status.setOnOff(type == type_);
-                       bool varia = type != "LongTableNoNumber";
+                       bool varia = type != "Unnumbered";
                        // check if the immediate parent inset allows caption variation
                        if (cur.depth() > 1) {
                                varia = cur[cur.depth() - 2].inset().allowsCaptionVariation(type);
@@ -301,7 +304,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 + "'";
        }