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

The two lines deleted here attempt to call virtual functions from a constructor. They have no effect, basically. Patch that does what these try to do forthcoming.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27125 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-10-26 01:18:26 +00:00
parent 1ba47caf04
commit 9e3b4803fe
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/insets/InsetCollapsable.cpp
View File

@ -86,7 +86,6 @@ InsetCollapsable::InsetCollapsable(Buffer const & buf,
setAutoBreakRows(true); setAutoBreakRows(true);
setDrawFrame(true); setDrawFrame(true);
setFrameColor(Color_collapsableframe); setFrameColor(Color_collapsableframe);
paragraphs().back().setLayout(dc.plainLayout());
} }

10
src/insets/InsetText.cpp
View File

@ -71,11 +71,11 @@ using graphics::PreviewLoader;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
InsetText::InsetText(Buffer const & buf) InsetText::InsetText(Buffer const & buf, bool useplain)
: drawFrame_(false), frame_color_(Color_insetframe) : drawFrame_(false), frame_color_(Color_insetframe)
{ {
initParagraphs(buf.params());
setBuffer(const_cast<Buffer &>(buf)); setBuffer(const_cast<Buffer &>(buf));
initParagraphs(useplain);
} }
@ -99,13 +99,15 @@ void InsetText::setBuffer(Buffer & buf)
} }
void InsetText::initParagraphs(BufferParams const & bparams) void InsetText::initParagraphs(bool useplain)
{ {
LASSERT(paragraphs().empty(), /**/); LASSERT(paragraphs().empty(), /**/);
paragraphs().push_back(Paragraph()); paragraphs().push_back(Paragraph());
Paragraph & ourpar = paragraphs().back(); Paragraph & ourpar = paragraphs().back();
ourpar.setInsetOwner(this); ourpar.setInsetOwner(this);
ourpar.setPlainOrDefaultLayout(bparams.documentClass()); DocumentClass const & dc = buffer_.params().documentClass();
Layout const & lay = useplain ? dc.plainLayout() : dc.defaultLayout();
ourpar.setLayout(lay);
} }