X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=5c9ba843c3858caae9f60fad1929e90adcdea7cd;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=23df61ad70fa6d616f93fe20aea17868d253e84a;hpb=83e37d57dd3228814360a46cb5487ed4fb50ee6c;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index 23df61ad70..5c9ba843c3 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -20,8 +20,6 @@
 
 #include "LString.h"
 
-#include <boost/optional.hpp>
-
 class Buffer;
 class BufferParams;
 class BufferView;
@@ -33,6 +31,7 @@ class LatexRunParams;
 class ParagraphParameters;
 class TexRow;
 class ParagraphList;
+class UpdatableInset;
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
@@ -57,7 +56,7 @@ public:
 	///
 	Paragraph(Paragraph const &);
 	///
-	//void operator=(Paragraph const &);
+	void operator=(Paragraph const &);
 	/// the destructor removes the new paragraph from the list
 	~Paragraph();
 
@@ -107,9 +106,9 @@ public:
 	void makeSameLayout(Paragraph const & par);
 
 	///
-	Inset * inInset() const;
+	UpdatableInset * inInset() const;
 	///
-	void setInsetOwner(Inset * i);
+	void setInsetOwner(UpdatableInset * inset);
 	///
 	void deleteInsetsLyXText(BufferView *);
 	///
@@ -284,24 +283,22 @@ public:
 	///
 	int stripLeadingSpaces();
 
-	///
+	/// return true if we allow multiple spaces
 	bool isFreeSpacing() const;
 
+	/// return true if we allow this par to stay empty
+	bool allowEmpty() const;
+
 	///
 	ParagraphParameters & params();
 	///
 	ParagraphParameters const & params() const;
 	///
 	InsetList insetlist;
-	///
-	void owningBuffer(Buffer const & b) {
-		buffer_.reset(&b);
-	}
+
 private:
 	///
 	LyXLayout_ptr layout_;
-	///
-	boost::optional<Buffer const *> buffer_;
 
 	struct Pimpl;
 	///