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

Reset buffer language only if we have something to reset.

Browse Source 
Fixes: #11063
(cherry picked from commit 599b1222f7)
This commit is contained in:
Juergen Spitzmueller 2018-03-09 12:15:19 +01:00
parent ebae08616b
commit 73c41a3c41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CutAndPaste.cpp
View File

@ -1225,13 +1225,13 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
Buffer buffer("", false); Buffer buffer("", false);
buffer.setUnnamed(true); buffer.setUnnamed(true);
available = buffer.importString(names[i], text, errorList); available = buffer.importString(names[i], text, errorList);
if (available)
available = !buffer.paragraphs().empty();
if (available && !buffer.paragraphs()[0].empty()) {
// TeX2lyx (also used in the HTML chain) assumes English as document language // TeX2lyx (also used in the HTML chain) assumes English as document language
// if no language is explicitly set (as is the case here). // if no language is explicitly set (as is the case here).
// We thus reset the temp buffer's language to the context language // We thus reset the temp buffer's language to the context language
buffer.changeLanguage(buffer.language(), cur.getFont().language()); buffer.changeLanguage(buffer.language(), cur.getFont().language());
if (available)
available = !buffer.paragraphs().empty();
if (available && !buffer.paragraphs()[0].empty()) {
cur.recordUndo(); cur.recordUndo();
pasteParagraphList(cur, buffer.paragraphs(), pasteParagraphList(cur, buffer.paragraphs(),
buffer.params().documentClassPtr(), errorList); buffer.params().documentClassPtr(), errorList);