Split pdf format as discussed on the list

[lyx.git] / src / insets / InsetFlex.cpp

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 6d64c3f8ead6a4f839e1a93f26e2a67b9e0d2b70..5609934b6d16cb144b3dfc18b5a29190f5787ba9 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -33,9 +33,7 @@ namespace lyx {
 
 InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
        : InsetCollapsable(buf), name_(layoutName)
-{
-       status_= Collapsed;
-}
+{}
 
 
 InsetFlex::InsetFlex(InsetFlex const & in)
@@ -43,8 +41,12 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
+// special code for InsetFlex when there is not the explicit Flex:: prefix
 InsetLayout const & InsetFlex::getLayout() const
 {
+       if (!buffer_)
+               return DocumentClass::plainInsetLayout();
+
        DocumentClass const & dc = buffer().params().documentClass();
        docstring const dname = from_utf8(name_); 
        if (dc.hasInsetLayout(dname))
@@ -53,6 +55,14 @@ InsetLayout const & InsetFlex::getLayout() const
 }
 
 
+bool InsetFlex::resetFontEdit() const
+{
+       if (getLayout().resetsFont())
+               return true;
+       return InsetCollapsable::resetFontEdit();
+}
+
+
 InsetLayout::InsetDecoration InsetFlex::decoration() const
 {
        InsetLayout::InsetDecoration const dec = getLayout().decoration();