X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=39b732fea6b2affdec2d3ab6d800c9b1bb010fe3;hb=32f6c066ccad00e1580f1f2a5c1d989153e4a83b;hp=23774c0335df7e296acaa3894a4c675c99902339;hpb=2a11b8347c7a3a71decf171ccaf5a102cb282c3b;p=lyx.git

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 23774c0335..39b732fea6 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -97,7 +97,7 @@ bool checkPastePossible(int index)
 
 
 pair<PitPosPair, pit_type>
-pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
+pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
 		     DocumentClass const * const oldDocClass, ErrorList & errorlist)
 {
 	Buffer const & buffer = *cur.buffer();
@@ -537,7 +537,7 @@ void copySelectionHelper(Buffer const & buf, Text const & text,
 		// PassThru paragraphs have the Language
 		// latex_language. This is invalid for others, so we
 		// need to change it to the buffer language.
-		if (text.inset().getLayout().isPassThru())
+		if (it->isPassThru())
 			it->changeLanguage(buf.params(), 
 					   latex_language, buf.language());
 	}
@@ -667,18 +667,25 @@ void switchBetweenClasses(DocumentClass const * const oldone,
 		if (it->lyxCode() != FLEX_CODE)
 			// FIXME: Should we verify all InsetCollapsable?
 			continue;
-		docstring const & n = newone->insetLayout(it->name()).name();
+
+		docstring const layoutName = it->layoutName();
+		docstring const & n = newone->insetLayout(layoutName).name();
 		bool const is_undefined = n.empty() ||
 			n == DocumentClass::plainInsetLayout().name();
 		if (!is_undefined)
 			continue;
+
 		// The flex inset is undefined in newtc
-		docstring const s = bformat(_(
-			"Flex inset %1$s is "
-			"undefined because of class "
-			"conversion from\n%2$s to %3$s"),
-			it->name(), from_utf8(oldtc.name()),
-			from_utf8(newtc.name()));
+		docstring const oldname = from_utf8(oldtc.name());
+		docstring const newname = from_utf8(newtc.name());
+		docstring s;
+		if (oldname == newname)
+			s = bformat(_("Flex inset %1$s is undefined after "
+				"reloading `%2$s' layout."), layoutName, oldname);
+		else
+			s = bformat(_("Flex inset %1$s is undefined because of "
+				"conversion from `%2$s' layout to `%3$s'."),
+				layoutName, oldname, newname);
 		// To warn the user that something had to be done.
 		errorlist.push_back(ErrorItem(
 				_("Undefined flex inset"),