unneeded header

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index be0d0b1ef7df8dbfb3fd900d3adea8bd334531b8..7bf747527b8202cad7475e5d78a70dcde80137a9 100644 (file)
--- 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,17 +209,21 @@ 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);
 
        /// set change at given pos
        void setChange(pos_type pos, Change const & change);
 
-       /// accept change
-       void acceptChange(pos_type start, pos_type end);
+       /// accept changes within the given range
+       void acceptChanges(pos_type start, pos_type end);
 
-       /// reject change
-       void rejectChange(pos_type start, pos_type end);
+       /// reject changes within the given range
+       void rejectChanges(pos_type start, pos_type end);
 
        /// Paragraphs can contain "manual labels", for example, Description
        /// environment. The text for this user-editable label is stored in