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

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 364e1e9d03..39b732fea6 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -35,6 +35,7 @@
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
+#include "TextClass.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBranch.h"
@@ -96,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();
@@ -123,10 +124,9 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 	// Now remove all out of the pars which is NOT allowed in the
 	// new environment and set also another font if that is required.
 
-	// Convert newline to paragraph break in ERT inset.
-	// This should not be here!
-	InsetCode const code = target_inset->lyxCode();
-	if (code == ERT_CODE || code == LISTINGS_CODE) {
+	// Convert newline to paragraph break in ParbreakIsNewline
+	if (target_inset->getLayout().parbreakIsNewline()
+	    || pars[pit].layout().parbreak_is_newline) {
 		for (size_t i = 0; i != insertion.size(); ++i) {
 			for (pos_type j = 0; j != insertion[i].size(); ++j) {
 				if (insertion[i].isNewline(j)) {
@@ -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"),
@@ -784,7 +791,12 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
 
 		// need a valid cursor. (Lgb)
 		cur.clearSelection();
-		cur.forceBufferUpdate();
+
+		// After a cut operation, we must make sure that the Buffer is updated
+		// because some further operation might need updated label information for
+		// example. So we cannot just use "cur.forceBufferUpdate()" here.
+		// This fixes #7071.
+		cur.buffer()->updateBuffer();
 
 		// tell tabular that a recent copy happened
 		dirtyTabularStack(false);
@@ -1036,7 +1048,7 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
 	// create inset for graphic
 	InsetGraphics * inset = new InsetGraphics(cur.buffer());
 	InsetGraphicsParams params;
-	params.filename = support::DocFileName(filename.absFileName());
+	params.filename = support::DocFileName(filename.absFileName(), false);
 	inset->setParams(params);
 	cur.recordUndo();
 	cur.insert(inset);