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

Refactor code to avoid the problem fixed at the last commit.

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-04-25 01:11:30 -04:00
parent b5a5a529a3
commit c67b6be77e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Text.cpp
View File

@ -1800,12 +1800,6 @@ bool Text::dissolveInset(Cursor & cur)
// save position inside inset
pos_type spos = cur.pos();
pit_type spit = cur.pit();
ParagraphList plist;
if (cur.lastpit() != 0 || cur.lastpos() != 0) {
plist = paragraphs();
for (auto & p : plist)
p.setInsetBuffers(*cur.buffer());
}
cur.popBackward();
// update cursor offset
if (spit == 0)
@ -1818,7 +1812,8 @@ bool Text::dissolveInset(Cursor & cur)
++cur.pos();
Buffer & b = *cur.buffer();
if (!plist.empty()) {
// Is there anything in this text?
if (cur.lastpit() != 0 || cur.lastpos() != 0) {
// see bug 7319
// we clear the cache so that we won't get conflicts with labels
// that get pasted into the buffer. we should update this before
@ -1828,6 +1823,7 @@ bool Text::dissolveInset(Cursor & cur)
// but we'll try the cheaper solution here.
cur.buffer()->clearReferenceCache();
ParagraphList & plist = paragraphs();
if (!lyxrc.ct_markup_copied)
// Do not revive deleted text
lyx::acceptChanges(plist, b.params());