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 2b71a2256a730f80990a4e8fbe6777393bec1cf4..7b0f8d08437ec4dff362f2842db5918f5907e194 100644 (file)
--- 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);