From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Sun, 5 Oct 2008 11:00:48 +0000 (+0000)
Subject: * InsetFlex.h:
X-Git-Tag: 1.6.10~3171
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e7b99324caf1293514b550a9674ea0053584ebd1;p=features.git

* InsetFlex.h:
	- correct the enabling of paragraph and layout changes as far as this
	  is possible with the current interface (see FIXMEs).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26743 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index bd165c55af..665dfa6f4e 100644
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -35,8 +35,6 @@ public:
 	void write(std::ostream &) const;
 	///
 	void read(Lexer & lex);
-	///
-	virtual bool allowParagraphCustomization(idx_type = 0) const { return false; }
 
 	///
 	int plaintext(odocstream &, OutputParams const &) const;
@@ -53,6 +51,14 @@ protected:
 
 private:
 	Inset * clone() const { return new InsetFlex(*this); }
+	/// 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(); }
+	/// 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(); }
 
 	///
 	std::string name_;