From: Richard Heck <rgheck@comcast.net>
Date: Wed, 26 Mar 2008 04:08:20 +0000 (+0000)
Subject: Revert last commit.
X-Git-Tag: 1.6.10~5425
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=30c7f6f0194c7854eb969f0fb00e9485d8048d1b;p=features.git

Revert last commit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23965 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a502bf910a..e4592b56f0 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -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);
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 093eabee0e..9d5b97fe54 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -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);
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 7b2648ac27..e2b7f8a9f7 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -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 
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 76caba8be2..2a596c0138 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -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());
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 644a7fede5..afb874a442 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -37,6 +37,8 @@ public:
 	///
 	explicit InsetText(Buffer const & buffer);
 	///
+	InsetText();
+	///
 	InsetText(InsetText const &);
 	///
 	void initParagraphs(Buffer const & buffer);