mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
Revert last commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23965 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0922e29029
commit
30c7f6f019
@ -238,7 +238,7 @@ Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
|
||||
read_only(readonly_), filename(file), file_fully_loaded(false),
|
||||
toc_backend(&parent), macro_lock(false),
|
||||
embedded_files(), timestamp_(0), checksum_(0), wa_(0),
|
||||
undo_(parent), inset(parent)
|
||||
undo_(parent)
|
||||
{
|
||||
temppath = createBufferTmpDir();
|
||||
lyxvc.setBuffer(&parent);
|
||||
|
@ -140,7 +140,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
|
||||
}
|
||||
|
||||
// Make sure there is no class difference.
|
||||
InsetText in(cur.buffer());
|
||||
InsetText in;
|
||||
// This works without copying any paragraph data because we have
|
||||
// a specialized swap method for ParagraphList. This is important
|
||||
// since we store pointers to insets at some places and we don't
|
||||
@ -194,7 +194,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
|
||||
}
|
||||
|
||||
// Prepare the paragraphs and insets for insertion.
|
||||
// Insets store buffer references so need updating.
|
||||
// A couple of insets store buffer references so need updating.
|
||||
insertion.swap(in.paragraphs());
|
||||
|
||||
InsetIterator const i_end = inset_iterator_end(in);
|
||||
|
@ -512,10 +512,6 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
|
||||
// Nothing to do.
|
||||
cur.undispatched();
|
||||
return;
|
||||
case mouse_button::none:
|
||||
case mouse_button::button4:
|
||||
case mouse_button::button5:
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (geometry() == NoButton
|
||||
|
@ -70,7 +70,6 @@ using graphics::PreviewLoader;
|
||||
InsetText::InsetText(Buffer const & buf)
|
||||
: drawFrame_(false), frame_color_(Color_insetframe)
|
||||
{
|
||||
Inset::setBuffer(const_cast<Buffer &>(buf));
|
||||
initParagraphs(buf);
|
||||
}
|
||||
|
||||
@ -86,6 +85,10 @@ InsetText::InsetText(InsetText const & in)
|
||||
}
|
||||
|
||||
|
||||
InsetText::InsetText()
|
||||
{}
|
||||
|
||||
|
||||
void InsetText::initParagraphs(Buffer const & buf)
|
||||
{
|
||||
BOOST_ASSERT(paragraphs().empty());
|
||||
|
@ -37,6 +37,8 @@ public:
|
||||
///
|
||||
explicit InsetText(Buffer const & buffer);
|
||||
///
|
||||
InsetText();
|
||||
///
|
||||
InsetText(InsetText const &);
|
||||
///
|
||||
void initParagraphs(Buffer const & buffer);
|
||||
|
Loading…
Reference in New Issue
Block a user