Change the "empty layout" to the "plain layout", to try to avoid confusion.

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 7cb36e2a9a4fc2406d3a6c7209f62280ee14551b..98e5d6c735b4543b5832100585e2b3c8c6baeb7e 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -86,7 +86,7 @@ InsetCollapsable::InsetCollapsable(Buffer const & buf,
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
-       paragraphs().back().setLayout(dc.emptyLayout());
+       paragraphs().back().setLayout(dc.plainLayout());
 }
 
 
@@ -147,7 +147,7 @@ void InsetCollapsable::setLayout(DocumentClass const * const dc)
                layout_ = &(dc->insetLayout(name()));
                labelstring_ = translateIfPossible(layout_->labelstring());
        } else {
-               layout_ = &DocumentClass::emptyInsetLayout();
+               layout_ = &DocumentClass::plainInsetLayout();
                labelstring_ = _("UNDEFINED");
        }
 
@@ -167,7 +167,7 @@ void InsetCollapsable::write(ostream & os) const
                break;
        }
        os << "\n";
-       text_.write(buffer(), os);
+       text().write(buffer(), os);
 }
 
 
@@ -848,7 +848,7 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
 bool InsetCollapsable::undefined() const
 {
        docstring const & n = getLayout().name();
-       return n.empty() || n == DocumentClass::emptyInsetLayout().name();
+       return n.empty() || n == DocumentClass::plainInsetLayout().name();
 }