X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.cpp;h=625d258d7d7271e3ac5c82d4107f00d1864a5006;hb=9337d73f1f9a6d4dae2e239e9f679a7452660c40;hp=278478f483a0d06c9bdb19cd643fe86b86eb2c09;hpb=2bf1c09376de37a3d66b79ca5f4304f29d5b4d06;p=lyx.git

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 278478f483..625d258d7d 100644
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -72,23 +72,20 @@ void breakParagraph(BufferParams const & bparams,
 
 	Paragraph & par = pars[par_offset];
 
-	// without doing that we get a crash when typing <Return> at the
-	// end of a paragraph
-	if (par.useEmptyLayout())
-		tmp->layout(bparams.getTextClass().emptyLayout());
-	else
-		tmp->layout(bparams.getTextClass().defaultLayout());
 	// remember to set the inset_owner
 	tmp->setInsetOwner(par.inInset());
+	// without doing that we get a crash when typing <Return> at the
+	// end of a paragraph
+	tmp->setEmptyOrDefaultLayout(bparams.documentClass());
 
 	// layout stays the same with latex-environments
 	if (keep_layout) {
-		tmp->layout(par.layout());
+		tmp->setLayout(par.layout());
 		tmp->setLabelWidthString(par.params().labelWidthString());
 		tmp->params().depth(par.params().depth());
 	} else if (par.params().depth() > 0) {
 		Paragraph const & hook = pars[outerHook(par_offset, pars)];
-		tmp->layout(hook.layout());
+		tmp->setLayout(hook.layout());
 		// not sure the line below is useful
 		tmp->setLabelWidthString(par.params().labelWidthString());
 		tmp->params().depth(hook.params().depth());
@@ -97,7 +94,7 @@ void breakParagraph(BufferParams const & bparams,
 	bool const isempty = (par.allowEmpty() && par.empty());
 
 	if (!isempty && (par.size() > pos || par.empty())) {
-		tmp->layout(par.layout());
+		tmp->setLayout(par.layout());
 		tmp->params().align(par.params().align());
 		tmp->setLabelWidthString(par.params().labelWidthString());
 
@@ -144,12 +141,12 @@ void breakParagraph(BufferParams const & bparams,
 		par.params().clear();
 		// do not lose start of appendix marker (bug 4212)
 		par.params().startOfAppendix(soa);
-		par.layout(bparams.getTextClass().defaultLayout());
+		par.setEmptyOrDefaultLayout(bparams.documentClass());
 	}
 
 	// layout stays the same with latex-environments
 	if (keep_layout) {
-		par.layout(tmp->layout());
+		par.setLayout(tmp->layout());
 		par.setLabelWidthString(tmp->params().labelWidthString());
 		par.params().depth(tmp->params().depth());
 	}
@@ -267,8 +264,8 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
 	pit_type pit = p;
 	depth_type par_depth = pars[p].getDepth();
 	while (pit != pit_type(pars.size())) {
-		LayoutPtr const & layout = pars[pit].layout();
-		int const endlabeltype = layout->endlabeltype;
+		Layout const & layout = pars[pit].layout();
+		int const endlabeltype = layout.endlabeltype;
 
 		if (endlabeltype != END_LABEL_NO_LABEL) {
 			if (p + 1 == pit_type(pars.size()))
@@ -302,7 +299,7 @@ Font const outerFont(pit_type par_offset, ParagraphList const & pars)
 	       && !tmpfont.resolved()) {
 		par_offset = outerHook(par_offset, pars);
 		if (par_offset != pit_type(pars.size())) {
-			tmpfont.realize(pars[par_offset].layout()->font);
+			tmpfont.realize(pars[par_offset].layout().font);
 			par_depth = pars[par_offset].getDepth();
 		}
 	}