The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit ad7deaabeb9eef713b2ceeeb75c48202fa7f2c12
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 b84e52f..4b95b9b 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -1002,7 +1002,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();
 }
 
 
@@ -1026,7 +1025,6 @@ void pasteClipboardText(Cursor & cur, ErrorList & 
errorList, bool asParagraphs)
                                cur.recordUndo();
                                pasteParagraphList(cur, buffer.paragraphs(),
                                        buffer.params().documentClassPtr(), 
errorList);
-                               cur.setSelection();
                                return;
                        }
                }
@@ -1041,7 +1039,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();
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/CutAndPaste.cpp |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to