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

Revert last commit.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23965 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-03-26 04:08:20 +00:00
parent 0922e29029
commit 30c7f6f019
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Buffer.cpp
View File

@ -238,7 +238,7 @@ Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
read_only(readonly_), filename(file), file_fully_loaded(false), read_only(readonly_), filename(file), file_fully_loaded(false),
toc_backend(&parent), macro_lock(false), toc_backend(&parent), macro_lock(false),
embedded_files(), timestamp_(0), checksum_(0), wa_(0), embedded_files(), timestamp_(0), checksum_(0), wa_(0),
undo_(parent), inset(parent) undo_(parent)
{ {
temppath = createBufferTmpDir(); temppath = createBufferTmpDir();
lyxvc.setBuffer(&parent); lyxvc.setBuffer(&parent);

4
src/CutAndPaste.cpp
View File

@ -140,7 +140,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
} }
// Make sure there is no class difference. // Make sure there is no class difference.
InsetText in(cur.buffer()); InsetText in;
// This works without copying any paragraph data because we have // This works without copying any paragraph data because we have
// a specialized swap method for ParagraphList. This is important // a specialized swap method for ParagraphList. This is important
// since we store pointers to insets at some places and we don't // 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. // 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()); insertion.swap(in.paragraphs());
InsetIterator const i_end = inset_iterator_end(in); InsetIterator const i_end = inset_iterator_end(in);

4
src/insets/InsetCollapsable.cpp
View File

@ -512,10 +512,6 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
// Nothing to do. // Nothing to do.
cur.undispatched(); cur.undispatched();
return; return;
case mouse_button::none:
case mouse_button::button4:
case mouse_button::button5:
break;
} }
} }
if (geometry() == NoButton if (geometry() == NoButton

5
src/insets/InsetText.cpp
View File

@ -70,7 +70,6 @@ using graphics::PreviewLoader;
InsetText::InsetText(Buffer const & buf) InsetText::InsetText(Buffer const & buf)
: drawFrame_(false), frame_color_(Color_insetframe) : drawFrame_(false), frame_color_(Color_insetframe)
{ {
Inset::setBuffer(const_cast<Buffer &>(buf));
initParagraphs(buf); initParagraphs(buf);
} }
@ -86,6 +85,10 @@ InsetText::InsetText(InsetText const & in)
} }
InsetText::InsetText()
{}
void InsetText::initParagraphs(Buffer const & buf) void InsetText::initParagraphs(Buffer const & buf)
{ {
BOOST_ASSERT(paragraphs().empty()); BOOST_ASSERT(paragraphs().empty());

2
src/insets/InsetText.h
View File

@ -37,6 +37,8 @@ public:
/// ///
explicit InsetText(Buffer const & buffer); explicit InsetText(Buffer const & buffer);
/// ///
InsetText();
///
InsetText(InsetText const &); InsetText(InsetText const &);
/// ///
void initParagraphs(Buffer const & buffer); void initParagraphs(Buffer const & buffer);