From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 14 Jul 2009 18:30:13 +0000 (+0000)
Subject: streamline InsetERT
X-Git-Tag: 2.0.0~6018
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5077b1ff117f033645ea047652843f1898f60d73;hp=7345921eb2c416a8084081d8609c893beb9e2c32;p=lyx.git

streamline InsetERT

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30584 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 47638eb847..90c595191b 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -69,12 +69,6 @@ docstring InsetERT::editMessage() const
 }
 
 
-int InsetERT::latex(odocstream & os, OutputParams const & op) const
-{
-	return InsetCollapsable::latex(os, op);
-}
-
-
 int InsetERT::plaintext(odocstream &, OutputParams const &) const
 {
 	return 0; // do not output TeX code
@@ -105,23 +99,12 @@ int InsetERT::docbook(odocstream & os, OutputParams const &) const
 
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	BufferParams const & bp = cur.buffer()->params();
-	Layout const layout = bp.documentClass().plainLayout();
-	//lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
 	switch (cmd.action) {
 	case LFUN_INSET_MODIFY: {
 		setStatus(cur, string2params(to_utf8(cmd.argument())));
 		break;
 	}
 	default:
-		// Force any new text to latex_language
-		// FIXME: This should not be necessary but
-		// new paragraphs that are created by pressing enter at the
-		// start of an existing paragraph get the buffer language
-		// and not latex_language, so we take this brute force
-		// approach.
-		cur.current_font.fontInfo() = layout.font;
-		cur.real_current_font.fontInfo() = layout.font;
 		InsetCollapsable::doDispatch(cur, cmd);
 		break;
 	}
@@ -132,26 +115,12 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & status) const
 {
 	switch (cmd.action) {
-		case LFUN_CLIPBOARD_PASTE:
-		case LFUN_INSET_MODIFY:
-		case LFUN_PASTE:
-		case LFUN_PRIMARY_SELECTION_PASTE:
-		case LFUN_QUOTE_INSERT:
-			status.setEnabled(true);
-			return true;
-
-		// this one is difficult to get right. As a half-baked
-		// solution, we consider only the first action of the sequence
-		case LFUN_COMMAND_SEQUENCE: {
-			// argument contains ';'-terminated commands
-			string const firstcmd = token(to_utf8(cmd.argument()), ';', 0);
-			FuncRequest func(lyxaction.lookupFunc(firstcmd));
-			func.origin = cmd.origin;
-			return getStatus(cur, func, status);
-		}
-
-		default:
-			return InsetCollapsable::getStatus(cur, cmd, status);
+	case LFUN_INSET_MODIFY:
+		status.setEnabled(true);
+		return true;
+		
+	default:
+		return InsetCollapsable::getStatus(cur, cmd, status);
 	}
 }
 
diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 1e02fc8d9f..494f53e929 100644
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -51,8 +51,6 @@ private:
 	///
 	bool insetAllowed(InsetCode code) const;
 	///
-	int latex(odocstream &, OutputParams const &) const;
-	///
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;