The last commit was, uhh, not what I intended.

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

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index 665dfa6f4e770f40ca29bded0d6911968bf01b02..96b3a71b2e41c411022a253a1d18c5da152230de 100644 (file)
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -51,14 +51,17 @@ protected:
 
 private:
        Inset * clone() const { return new InsetFlex(*this); }
+       // FIXME The following two routines should be moved to InsetCollapsable.
+       // That will allow the redeclarations of these routines to be removed
+       // from its subclasses, such as InsetERT. But it will also require us
+       // to rework stdinsets.inc, to make sure we get the right behavior from
+       // the subclasses.
        /// should paragraphs be forced to use the empty layout?
-       //FIXME: this is not always correct. We need a layout tag that indicates
-       // whether layout changes are allowed or not
-       virtual bool forcePlainLayout(idx_type = 0) const { return !allowMultiPar(); }
+       virtual bool forcePlainLayout(idx_type = 0) const 
+               { return getLayout().forcePlainLayout(); }
        /// should the user be allowed to customize alignment, etc.?
-       //FIXME: this is not always correct. We need a layout tag that indicates
-       // whether paragraph customization is allowed or not
-       virtual bool allowParagraphCustomization(idx_type = 0) const { return allowMultiPar(); }
+       virtual bool allowParagraphCustomization(idx_type = 0) const 
+               { return getLayout().allowParagraphCustomization(); }
 
        ///
        std::string name_;