X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=dee7e29f7a6083ff0fa4caa306c5a018b85b3353;hb=2906a35663b92030b0668a42ab370dba8ffca4cf;hp=2b71a2256a730f80990a4e8fbe6777393bec1cf4;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 2b71a2256a..dee7e29f7a 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -159,7 +159,6 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 
 	lex.pushTable(elementTags);
 
-	FontInfo font = inherit_font;
 	labelfont_ = inherit_font;
 	bgcolor_ = Color_none;
 	bool getout = false;
@@ -183,6 +182,14 @@ 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_ != from_ascii("undefined")
+			    && 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.");
+				break;
+			}
 			string lt;
 			lex >> lt;
 			lyxtype_ = translateLyXType(lt);