* output_plaintext.C: cosmetics in comment: line length cannot be < 0

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 221fb941432c0082ec69ddf858f657c902c2c58f..aaf04c62a79614cfe70f1054b289eba5d1628fd4 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -35,18 +35,19 @@ public:
        Pimpl(Paragraph * owner);
        /// "Copy constructor"
        Pimpl(Pimpl const &, Paragraph * owner);
-       ///
-       void setContentsFromPar(Paragraph const & par);
 
        //
        // Change tracking
        //
        /// look up change at given pos
-       Change const lookupChange(pos_type pos) const;
+       Change const & lookupChange(pos_type pos) const;
        /// is there a change within the given range ?
        bool isChanged(pos_type start, pos_type end) const;
-        /// set change for the entire par
-        void setChange(Change const & change);
+       /// 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 changes within the given range