]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.h
unneeded header
[lyx.git] / src / paragraph.h
index 77635bf2a318f4d0b14ca49704e935da8b8cccc4..7bf747527b8202cad7475e5d78a70dcde80137a9 100644 (file)
@@ -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);