The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 18c887f2dbc442e2964380f5a5e2cbc872e3b382
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Fri Jun 1 12:34:51 2012 +0200
Fix bug #7956: Assertion When Trying to Paste Into Table
For some unknown reason, the paste code likes to call
Cursor::setSelection(), which is not appropriate here since we are not trying
to set a selection at this point.
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index c9fedec..ec19695 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -1004,7 +1004,6 @@ void pasteFromStack(Cursor & cur, ErrorList & errorList,
size_t sel_index)
cur.recordUndo();
pasteParagraphList(cur, theCuts[sel_index].first,
theCuts[sel_index].second, errorList);
- cur.setSelection();
}
@@ -1028,7 +1027,6 @@ void pasteClipboardText(Cursor & cur, ErrorList &
errorList, bool asParagraphs)
cur.recordUndo();
pasteParagraphList(cur, buffer.paragraphs(),
buffer.params().documentClassPtr(),
errorList);
- cur.setSelection();
return;
}
}
@@ -1043,7 +1041,6 @@ void pasteClipboardText(Cursor & cur, ErrorList &
errorList, bool asParagraphs)
cur.text()->insertStringAsParagraphs(cur, text,
cur.current_font);
else
cur.text()->insertStringAsLines(cur, text, cur.current_font);
- cur.setSelection();
}
diff --git a/status.20x b/status.20x
index 469dea6..8542b4f 100644
--- a/status.20x
+++ b/status.20x
@@ -151,6 +151,8 @@ What's new
- Fixed an infinite loop when pasting '\\ ' into math (bug 8089).
+- Fixed an assertion when trying to paste into a table (bug 7956).
+
- Fixed an infinite loop after removing the first paragraph of the
document if it had a non-zero depth (bug 7641).
-----------------------------------------------------------------------
Summary of changes:
src/CutAndPaste.cpp | 3 ---
status.20x | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
