Revert 23154.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8f67033361a3d01453268cf06826963a8003ad99..c34c8e8ac57cace3226abf58930d26bc7db8405b 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1473,7 +1473,7 @@ char Paragraph::getAlign() const
 }
 
 
-docstring const & Paragraph::getLabelstring() const
+docstring const & Paragraph::labelString() const
 {
        return d->params_.labelString();
 }
@@ -2335,9 +2335,18 @@ LayoutPtr const & Paragraph::layout() const
 }
 
 
-void Paragraph::layout(LayoutPtr const & new_layout)
+void Paragraph::setLayout(LayoutPtr const & layout)
 {
-       d->layout_ = new_layout;
+       d->layout_ = layout;
+}
+
+
+void Paragraph::setEmptyOrDefaultLayout(TextClass const & tclass)
+{
+       if (useEmptyLayout())
+               setLayout(tclass.emptyLayout());
+       else
+               setLayout(tclass.defaultLayout());
 }