Revert r33039, which did not work at all.

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

src/TextClass.cpp

@@ -622,7 +622,8 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
 				InsetLayout & il = insetlayoutlist_[name];
 				error = !il.read(lexrc, *this);
 			} else {
-				InsetLayout il(name);
+				InsetLayout il;
+				il.setName(name);
 				error = !il.read(lexrc, *this);
 				if (!error)
 					insetlayoutlist_[name] = il;

src/TextClass.h

@@ -322,6 +322,8 @@ private:
 	///
 	void readClassOptions(Lexer &);
 	///
+	void readCharStyle(Lexer &, std::string const &);
+	///
 	void readFloat(Lexer &);
 };
 

src/insets/InsetLayout.cpp

@@ -29,12 +29,8 @@ using std::vector;
 
 namespace lyx {
 
-InsetLayout::InsetLayout()
-{}
-
-
-InsetLayout::InsetLayout(docstring const & name) :
-	name_(name), lyxtype_(STANDARD),
+InsetLayout::InsetLayout() :
+	name_(from_ascii("undefined")), lyxtype_(STANDARD),
 	labelstring_(from_ascii("UNDEFINED")), contentaslabel_(false),
 	decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(sane_font), 
 	labelfont_(sane_font), bgcolor_(Color_error), 

src/insets/InsetLayout.h

@@ -30,11 +30,8 @@ class TextClass;
 ///
 class InsetLayout {
 public:
-	// just so these can be put in containers
-	// it should not really be used
-	InsetLayout();
 	///
-	InsetLayout(docstring const & name);
+	InsetLayout();
 	///
 	enum InsetDecoration {
 		CLASSIC,
@@ -63,6 +60,8 @@ public:
 	///
 	docstring name() const { return name_; }
 	///
+	void setName(docstring const & n) { name_ = n; }
+	///
 	InsetLyXType lyxtype() const { return lyxtype_; }
 	///
 	docstring labelstring() const { return labelstring_; }