anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* lyx_cb.C (insertPlaintextFile): delete selection before insertion

Browse Source 
and handle undo correctly (bug 3204)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17345 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-02-25 20:16:45 +00:00
parent e5a46922e9
commit 23b59966c7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lyx_cb.C
View File

@ -21,6 +21,7 @@
#include "BufferView.h"
#include "buffer_funcs.h"
#include "cursor.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "gettext.h"
#include "session.h"
@ -30,6 +31,7 @@
#include "lyxrc.h"
#include "lyxtext.h"
#include "paragraph.h"
#include "undo.h"
#include "frontends/Alert.h"
#include "frontends/Application.h"
@ -329,18 +331,17 @@ void insertPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
if (tmpstr.empty())
return;
// clear the selection
LyXText const & text = bv->buffer()->text();
if (&text == bv->cursor().innerText())
bv->cursor().clearSelection();
LCursor & cur = bv->cursor();
cap::replaceSelection(cur);
recordUndo(cur);
if (asParagraph)
bv->cursor().innerText()->insertStringAsParagraphs(bv->cursor(), tmpstr);
cur.innerText()->insertStringAsParagraphs(cur, tmpstr);
else
bv->cursor().innerText()->insertStringAsLines(bv->cursor(), tmpstr);
cur.innerText()->insertStringAsLines(cur, tmpstr);
}
// Insert plain text file (if filename is empty, prompt for one)
// Read plain text file (if filename is empty, prompt for one)
string getContentsOfPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
{
FileName fname(f);