X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=991ab14a7527d65083207e171b9e34b8fb720fce;hb=ea6aed5b8bf38366aaa1eb15ce1b9f13de76987f;hp=d3ef713338b15b6ad0fbce480339088f8fdd508f;hpb=236460445a8c8f4314e4f134d4979caaab8dce5d;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d3ef713338..991ab14a75 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -251,7 +251,8 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner)
 
 Paragraph::Private::Private(Private const & p, Paragraph * owner,
 	pos_type beg, pos_type end)
-	: owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_), 
+	: owner_(owner), inset_owner_(p.inset_owner_),
+	  insetlist_(p.insetlist_, beg, end),
 	  params_(p.params_), changes_(p.changes_),
 	  begin_of_body_(p.begin_of_body_), words_(p.words_),
 	  layout_(p.layout_)
@@ -260,16 +261,7 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner,
 	if (beg >= pos_type(p.text_.size()))
 		return;
 	text_ = p.text_.substr(beg, end - beg);
-	InsetList::const_iterator icit = p.insetlist_.begin();
-	InsetList::const_iterator iend = p.insetlist_.end();
-	for (; icit != iend; ++icit) {
-		if (icit->pos < beg)
-			continue;
-		if (icit->pos >= end)
-			break;
-		// Add a new entry in the insetlist_.
-		insetlist_.insert(icit->inset, icit->pos - beg);
-	}
+
 	FontList::const_iterator fcit = fontlist_.begin();
 	FontList::const_iterator fend = fontlist_.end();
 	for (; fcit != fend; ++fcit) {
@@ -1883,7 +1875,7 @@ bool Paragraph::latex(BufferParams const & bparams,
 	bool asdefault = forcePlainLayout();
 
 	Layout const & style = asdefault ?
-		bparams.documentClass().emptyLayout() :
+		bparams.documentClass().plainLayout() :
 		*d->layout_;
 
 	// Current base font for all inherited font changes, without any
@@ -2426,7 +2418,7 @@ void Paragraph::setLayout(Layout const & layout)
 void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
 {
 	if (usePlainLayout())
-		setLayout(tclass.emptyLayout());
+		setLayout(tclass.plainLayout());
 	else
 		setLayout(tclass.defaultLayout());
 }