anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport fix for bug #7905. We don't want to move out of the inset unless

Browse Source 
we've put something into it. (We also don't need to copy an empty string
into it.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40242 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-11-22 18:49:59 +00:00
parent 0c87fa9649
commit b367640290
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Text3.cpp
View File

@ -246,8 +246,10 @@ static bool doInsertInset(Cursor & cur, Text * text,
inset->edit(cur, true); inset->edit(cur, true);
// Now put this into inset // Now put this into inset
Font const f(inherit_font, cur.current_font.language()); Font const f(inherit_font, cur.current_font.language());
cur.text()->insertStringAsLines(cur, ds, f); if (!ds.empty()) {
cur.leaveInset(*inset); cur.text()->insertStringAsLines(cur, ds, f);
cur.leaveInset(*inset);
}
return true; return true;
} }

8
status.20x
View File

@ -194,13 +194,13 @@ What's new
* USER INTERFACE * USER INTERFACE
- Group correctly Koma book environments inside environment combo-box listing. - Correctly group Koma book environments inside environment combo-box listing.
- Add undo for change of text language when document language is changed. - Add undo for change of text language when document language is changed.
When a document is not multi-lingual the text contents is changed to the When a document is not multi-lingual, the text contents is changed to the
new language. This should be recorded for Undo (bug 7740). new language. This should be recorded for Undo (bug 7740).
- Adjust the cursor language after document language change had changed the - Adjust the cursor language after document language change has changed the
text language (bug 7681). text language (bug 7681).
- Correctly sort modules in Document->Settings and formats in the "Other - Correctly sort modules in Document->Settings and formats in the "Other
@ -272,6 +272,8 @@ What's new
- Fix crash when changing labelwidth (bug 7873). - Fix crash when changing labelwidth (bug 7873).
- Keep cursor inside index inset when a blank one is created (bug 7905).
* ADVANCED FIND AND REPLACE * ADVANCED FIND AND REPLACE