X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaptionable.cpp;h=61c9acc3b8ac492aa97ad84f2c3339d741fab7a3;hb=a6b07608d8e9de24383d3ebaec20b6b265ed9314;hp=0683aa69485b86d0cd2fe8e8fd9087125f6af943;hpb=3391fed36a574fb729f243888258d1b6d45b0251;p=features.git

diff --git a/src/insets/InsetCaptionable.cpp b/src/insets/InsetCaptionable.cpp
index 0683aa6948..61c9acc3b8 100644
--- a/src/insets/InsetCaptionable.cpp
+++ b/src/insets/InsetCaptionable.cpp
@@ -87,11 +87,11 @@ docstring InsetCaptionable::getCaptionHTML(OutputParams const & runparams) const
 		return docstring();
 
 	odocstringstream ods;
-	XHTMLStream xs(ods);
+	XMLStream xs(ods);
 	docstring def = ins->getCaptionAsHTML(xs, runparams);
 	if (!def.empty())
 		// should already have been escaped
-		xs << XHTMLStream::ESCAPE_NONE << def << '\n';
+		xs << XMLStream::ESCAPE_NONE << def << '\n';
 	return ods.str();
 }
 
@@ -110,11 +110,11 @@ void InsetCaptionable::addToToc(DocIterator const & cpit, bool output_active,
 	TocBuilder & b = backend.builder(caption_type_);
 	b.pushItem(pit, str, output_active);
 	// Proceed with the rest of the inset.
-	InsetCollapsable::addToToc(cpit, output_active, utype, backend);
+	InsetCollapsible::addToToc(cpit, output_active, utype, backend);
 	b.pop();
 }
 
-void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
 	Counters & cnts =
 		buffer().masterBuffer()->params().documentClass().counters();
@@ -131,7 +131,7 @@ void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype)
 	// Tell captions what the current float is
 	cnts.current_float(caption_type_);
 	cnts.isSubfloat(subflt);
-	InsetCollapsable::updateBuffer(it, utype);
+	InsetCollapsible::updateBuffer(it, utype, deleted);
 	// Restore counters
 	cnts.current_float(saveflt);
 	if (utype == OutputUpdate)
@@ -142,7 +142,7 @@ void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype)
 
 bool InsetCaptionable::insetAllowed(InsetCode c) const
 {
-	return (c == CAPTION_CODE) || InsetCollapsable::insetAllowed(c);
+	return (c == CAPTION_CODE) || InsetCollapsible::insetAllowed(c);
 }