commit 88f6da78af0e0c652332a0c77fd340d1ffa9bf73
Author: Richard Heck <[email protected]>
Date: Wed Jun 29 21:23:39 2016 -0400
Fix bug #8782: We need to query the cell, not just the inset.
(cherry picked from commit f49556b3ed1c4adb610b00385e60cf695f4aa914)
---
src/CutAndPaste.cpp | 2 +-
status.22x | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 256aeba..cd037d1 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -160,7 +160,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList
const & parlist,
// set the paragraphs to plain layout if necessary
DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr();
if (cur.inset().usePlainLayout()) {
- bool forcePlainLayout = cur.inset().forcePlainLayout();
+ bool forcePlainLayout = target_inset->forcePlainLayout();
Layout const & plainLayout = newDocClass->plainLayout();
Layout const & defaultLayout = newDocClass->defaultLayout();
ParagraphList::iterator const end = insertion.end();
diff --git a/status.22x b/status.22x
index 4239091..5e92dd3 100644
--- a/status.22x
+++ b/status.22x
@@ -108,6 +108,9 @@ What's new
- Do not omit the first space of the selection when copying (bug 9995).
+- Do not allow non-default layouts to be pasted into table cells that are not
fixed
+ width (bug 8782).
+
- Display the correct column alignment and a better column spacing in AMS
environments (bugs 1861, 9908).
