From: Richard Heck <rgheck@comcast.net>
Date: Tue, 29 Mar 2011 00:57:07 +0000 (+0000)
Subject: Continuing fix of #7080. Since we now demand "Flex:Whatever" as the name
X-Git-Tag: 2.0.0~357
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a39fbb4307483aa8fe2a446760738706b194eb3;p=features.git

Continuing fix of #7080. Since we now demand "Flex:Whatever" as the name
of a flex InsetLayout, let's check for it when we hit a LyXType tag, and
refuse to honor it unless we have the right sort of name.


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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 2b71a2256a..7b0f8d0843 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -183,6 +183,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		// way this sort of thing is handled in Layout::read(), namely, by
 		// using the Lexer.
 		case IL_LYXTYPE: {
+			// make sure that we have the right sort of name.
+			if (name_.substr(0,5) != from_ascii("Flex:")) {
+				LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
+				        "This one has the name `" << to_utf8(name_) << "'\n"
+				        "Ignoring LyXType declaration.");
+			}
 			string lt;
 			lex >> lt;
 			lyxtype_ = translateLyXType(lt);