X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=1c3689f627d81c1be78248329b45aad95c721913;hb=e449e70e3854da3aeda8dca1de22cabaf6ae0557;hp=df4f6e219325cd34734ab72cb73e18bd426583f5;hpb=eeb6b5b1533670fa4bb0793af9ec68d47dbcd5f3;p=lyx.git

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index df4f6e2193..1c3689f627 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -27,7 +27,6 @@
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetCaption.h"
 #include "InsetList.h"
 #include "Intl.h"
 #include "Language.h"
@@ -291,7 +290,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 	LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
 	// See bug #9042, for instance.
-	if (isPassThru() && lyxCode() != ARG_CODE) {
+	if (isPassThru()) {
 		// Force any new text to latex_language FIXME: This
 		// should only be necessary in constructor, but new
 		// paragraphs that are created by pressing enter at
@@ -1019,52 +1018,6 @@ docstring InsetText::toolTipText(docstring prefix, size_t const len) const
 }
 
 
-InsetCaption const * InsetText::getCaptionInset() const
-{
-	ParagraphList::const_iterator pit = paragraphs().begin();
-	for (; pit != paragraphs().end(); ++pit) {
-		InsetList::const_iterator it = pit->insetList().begin();
-		for (; it != pit->insetList().end(); ++it) {
-			Inset & inset = *it->inset;
-			if (inset.lyxCode() == CAPTION_CODE) {
-				InsetCaption const * ins =
-					static_cast<InsetCaption const *>(it->inset);
-				return ins;
-			}
-		}
-	}
-	return 0;
-}
-
-
-docstring InsetText::getCaptionText(OutputParams const & runparams) const
-{
-	InsetCaption const * ins = getCaptionInset();
-	if (ins == 0)
-		return docstring();
-
-	odocstringstream ods;
-	ins->getCaptionAsPlaintext(ods, runparams);
-	return ods.str();
-}
-
-
-docstring InsetText::getCaptionHTML(OutputParams const & runparams) const
-{
-	InsetCaption const * ins = getCaptionInset();
-	if (ins == 0)
-		return docstring();
-
-	odocstringstream ods;
-	XHTMLStream xs(ods);
-	docstring def = ins->getCaptionAsHTML(xs, runparams);
-	if (!def.empty())
-		// should already have been escaped
-		xs << XHTMLStream::ESCAPE_NONE << def << '\n';
-	return ods.str();
-}
-
-
 InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2)
 {
 	return static_cast<InsetText::XHTMLOptions>((int)a1 | (int)a2);