X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.cpp;h=279f9940542a2327f2fd1d300e5cf3b1bb4bf3b7;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=bb59337a16da0e2fde4247b6ee783dc5ecccad38;hpb=b9670d72090b1b77306c79ee040527e0bd2e60b3;p=lyx.git

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index bb59337a16..279f994054 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -30,9 +30,6 @@
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
 #include "support/convert.h"
 
 #include <sstream>
@@ -48,8 +45,8 @@ InsetFlex::InsetFlex(BufferParams const & bp,
 	name_(layoutName)
 {
 	setLayout(tc); // again, because now the name is initialized
-	packages_ = getLayout().requires;
-	preamble_ = getLayout().preamble;
+	packages_ = getLayout().requires();
+	preamble_ = getLayout().preamble();
 }
 
 
@@ -64,12 +61,6 @@ Inset * InsetFlex::clone() const
 }
 
 
-bool InsetFlex::undefined() const
-{
-	return getLayout().labelstring == from_utf8("UNDEFINED");
-}
-
-
 docstring const InsetFlex::editMessage() const
 {
 	return _("Opened Flex Inset");
@@ -120,8 +111,8 @@ int InsetFlex::docbook(Buffer const & buf, odocstream & os,
 	ParagraphList::const_iterator end = paragraphs().end();
 
 	if (!undefined())
-		sgml::openTag(os, getLayout().latexname,
-			      par->getID(buf, runparams) + getLayout().latexparam);
+		sgml::openTag(os, getLayout().latexname(),
+			      par->getID(buf, runparams) + getLayout().latexparam());
 
 	for (; par != end; ++par) {
 		par->simpleDocBookOnePar(buf, os, runparams,
@@ -130,7 +121,7 @@ int InsetFlex::docbook(Buffer const & buf, odocstream & os,
 	}
 
 	if (!undefined())
-		sgml::closeTag(os, getLayout().latexname);
+		sgml::closeTag(os, getLayout().latexname());
 
 	return 0;
 }