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

Yet more empty-->plain.

Browse Source 
By the way, can someone check around line 722 of CutAndPaste.cpp?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26028 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-08-01 21:58:27 +00:00
parent 0a8d713fad
commit f1f6ca0963
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CutAndPaste.cpp
View File

@ -130,26 +130,26 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
} }
} }
// set the paragraphs to empty layout if necessary // set the paragraphs to plain layout if necessary
if (cur.inset().usePlainLayout()) { if (cur.inset().usePlainLayout()) {
bool forcePlainLayout = cur.inset().forcePlainLayout(); bool forcePlainLayout = cur.inset().forcePlainLayout();
Layout const & emptyLayout = newDocClass->plainLayout(); Layout const & plainLayout = newDocClass->plainLayout();
Layout const & defaultLayout = newDocClass->defaultLayout(); Layout const & defaultLayout = newDocClass->defaultLayout();
ParagraphList::iterator const end = insertion.end(); ParagraphList::iterator const end = insertion.end();
ParagraphList::iterator par = insertion.begin(); ParagraphList::iterator par = insertion.begin();
for (; par != end; ++par) { for (; par != end; ++par) {
Layout const & parLayout = par->layout(); Layout const & parLayout = par->layout();
if (forcePlainLayout || parLayout == defaultLayout) if (forcePlainLayout || parLayout == defaultLayout)
par->setLayout(emptyLayout); par->setLayout(plainLayout);
} }
} else { // check if we need to reset from empty layout } else { // check if we need to reset from plain layout
Layout const & defaultLayout = newDocClass->defaultLayout(); Layout const & defaultLayout = newDocClass->defaultLayout();
Layout const & emptyLayout = newDocClass->plainLayout(); Layout const & plainLayout = newDocClass->plainLayout();
ParagraphList::iterator const end = insertion.end(); ParagraphList::iterator const end = insertion.end();
ParagraphList::iterator par = insertion.begin(); ParagraphList::iterator par = insertion.begin();
for (; par != end; ++par) { for (; par != end; ++par) {
Layout const & parLayout = par->layout(); Layout const & parLayout = par->layout();
if (parLayout == emptyLayout) if (parLayout == plainLayout)
par->setLayout(defaultLayout); par->setLayout(defaultLayout);
} }
} }
@ -719,7 +719,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
ParagraphList pars; ParagraphList pars;
Paragraph par; Paragraph par;
BufferParams const & bp = cur.buffer().params(); BufferParams const & bp = cur.buffer().params();
// FIXME This should be the empty layout...right? // FIXME This should be the plain layout...right?
par.setLayout(bp.documentClass().plainLayout()); par.setLayout(bp.documentClass().plainLayout());
par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED)); par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
pars.push_back(par); pars.push_back(par);