X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.h;h=a51f30ae412aebf036930ec36a046163250908bf;hb=25ef8e7eef8dfb2b6d6d4f2935ae6775ebf2ba60;hp=da421d5f00e05a18d0729e053eac148a2bb021c8;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index da421d5f00..a51f30ae41 100644
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -14,84 +14,47 @@
 #define INSETFLEX_H
 
 #include "InsetCollapsable.h"
-#include "TextClass.h"
-
 
 namespace lyx {
 
-
-class InsetFlexParams {
-public:
-	///
-	void write(std::ostream & os) const;
-	///
-	void read(Lexer & lex);
-	///
-	std::string name;
-};
-
-
 /** The Flex inset, e.g., CharStyle, Custom inset or XML short element
 
 */
 class InsetFlex : public InsetCollapsable {
 public:
 	///
-	InsetFlex(BufferParams const &, InsetLayout);
+	InsetFlex(Buffer *, std::string const & layoutName);
 	///
-	docstring name() const { return from_ascii("Flex"); }
+	docstring layoutName() const { return from_utf8("Flex:" + name_); }
 	///
-	InsetLayout const & getLayout(BufferParams const &) const { return layout_; } 
-	/// Is this character style defined in the document's textclass?
-	/// May be wrong after textclass change or paste from another document
-	bool undefined() const;
-	/// (Re-)set the character style parameters from \p il
-	void setLayout(InsetLayout il);
-	///
-	virtual docstring const editMessage() const;
+	InsetLayout const & getLayout() const;
 	///
 	InsetCode lyxCode() const { return FLEX_CODE; }
 	///
-	void write(Buffer const &, std::ostream &) const;
-	///
-	void read(Buffer const & buf, Lexer & lex);
-	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool resetFontEdit() const;
+	/// Default looks
+	InsetLayout::InsetDecoration decoration() const;
 	///
-	void draw(PainterInfo &, int, int) const;
-	///
-	void getDrawFont(FontInfo &) const;
-	///
-	bool forceDefaultParagraphs(idx_type) const { return true; }
-
+	void write(std::ostream &) const;
+	/// should paragraph indendation be ommitted in any case?
+	bool neverIndent() const { return true; }
 	///
-	int plaintext(Buffer const &, odocstream &,
-		      OutputParams const &) const;
+	bool hasSettings() const { return false; }
 	///
-	int docbook(Buffer const &, odocstream &,
-		    OutputParams const &) const;
-	/// the string that is passed to the TOC
-	virtual void textString(Buffer const &, odocstream &) const;
-
+	bool getStatus(Cursor & cur, FuncRequest const & cmd,
+		FuncStatus &) const;
 	///
-	InsetFlexParams const & params() const { return params_; }
-
-	/// should paragraph indendation be ommitted in any case?
-	bool neverIndent(Buffer const &) const { return true; }
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
 
 protected:
-	InsetFlex(InsetFlex const &);
-	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+	InsetFlex(InsetFlex const &);
 
 private:
-	friend class InsetFlexParams;
-
-	virtual Inset * clone() const;
-
 	///
-	InsetFlexParams params_;
+	Inset * clone() const { return new InsetFlex(*this); }
+	///
+	std::string name_;
 };