X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=7bf747527b8202cad7475e5d78a70dcde80137a9;hb=d2574b7d8e2716d3d3aea92df6576bd01c421a6c;hp=77635bf2a318f4d0b14ca49704e935da8b8cccc4;hpb=d53d4a5c3528c8dfa06ec55229eacac8f5783150;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index 77635bf2a3..7bf747527b 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -178,8 +178,6 @@ public:
 	///
 	bool empty() const { return text_.empty(); }
 	///
-	void setContentsFromPar(Paragraph const & par);
-	///
 	void clearContents();
 
 	///
@@ -211,6 +209,10 @@ public:
 		return lookupChange(pos).type == Change::DELETED;
 	}
 
+	/// will the paragraph be physically merged with the next
+	/// one if the imaginary end-of-par character is logically deleted?
+	bool isMergedOnEndOfParDeletion(bool trackChanges) const;
+
 	/// set change for the entire par
 	void setChange(Change const & change);