Fix crash when selecting text with changes

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 2d855ecc8fa53b0b954996f753f1369f151b3210..61af5ff1c41f417ee5f2bea05b83e3c8aef4eb63 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -127,12 +127,16 @@ public:
        /// truncates str to maxlenwith an ellipsis and replaces the characters '\n'
        /// and '\t' with spaces
        static void shortenForOutliner(docstring & str, size_t const maxlen);
-               
+
        /// Appends a possibly abbreviated representation of our text to \param os,
        /// where \param maxlen defines the maximum size of \param os. If \param
-       /// shorten is true, then os is shortened as above
-       void forOutliner(docstring & os, size_t const maxlen,
-                                        bool const shorten = true) const;
+       /// shorten is true, then os is shortened as above.
+       void forOutliner(docstring & os, size_t maxlen, bool shorten = true) const;
+       /// Appends a possibly abbreviated representation of our text, from
+       /// start to end, to \param os, where \param maxlen defines the
+       /// maximum size of \param os. Omits the label of the first paragraph.
+       void forOutliner(docstring & os, size_t maxlen, pit_type start, pit_type end,
+                        bool shorten = true) const;
 
        /// insert a character at cursor position
        /// FIXME: replace Cursor with DocIterator.
@@ -153,8 +157,8 @@ public:
        /// read-write access to individual paragraph
        Paragraph & getPar(pit_type pit) { return pars_[pit]; }
        // Returns the current font and depth as a message.
-       /// FIXME: replace Cursor with DocIterator.
-       docstring currentState(Cursor const & cur) const;
+       // When \param devel_mode is true, add more precise information
+       docstring currentState(Cursor const & cur, bool devel_mode) const;
 
        /** Find the word under \c from in the relative location
         *  defined by \c word_location.
@@ -168,7 +172,7 @@ public:
        void selectAll(Cursor & cur);
        /// convenience function get the previous word or an empty string
        docstring previousWord(CursorSlice const & sl) const;
-       
+
        /// what type of change operation to make
        enum ChangeOp {
                ACCEPT,
@@ -182,12 +186,10 @@ public:
        void rejectChanges();
 
        /// returns true if par was empty and was removed
-       bool setCursor(Cursor & cur, pit_type par, pos_type pos,
+       bool setCursor(Cursor & cur, pit_type pit, pos_type pos,
                       bool setfont = true, bool boundary = false);
        ///
-       void setCursor(CursorSlice &, pit_type par, pos_type pos);
-       ///
-       void setCursorIntern(Cursor & cur, pit_type par,
+       void setCursorIntern(Cursor & cur, pit_type pit,
                 pos_type pos, bool setfont = true, bool boundary = false);
 
        /// Move cursor one position backwards
@@ -221,9 +223,10 @@ public:
        ///
        bool cursorVisRightOneWord(Cursor & cur);
        /// Delete from cursor up to the end of the current or next word.
-       void deleteWordForward(Cursor & cur);
+       /// Use force to skip the confirmDeletion check.
+       void deleteWordForward(Cursor & cur, bool force = false);
        /// Delete from cursor to start of current or prior word.
-       void deleteWordBackward(Cursor & cur);
+       void deleteWordBackward(Cursor & cur, bool force = false);
        ///
        bool cursorUpParagraph(Cursor & cur);
        ///
@@ -322,29 +325,28 @@ public:
        docstring completionPrefix(Cursor const & cur) const;
        /// find a paragraph before \p par with the given \p depth, if such
        /// a paragraph cannot be found, \p par is returned
-       pit_type depthHook(pit_type par, depth_type depth) const;
+       pit_type depthHook(pit_type pit, depth_type depth) const;
        /// find a paragraph before \p par with depth less than the
        /// depth of \p par. If such paragraph cannot be found because
        /// \p par already has depth 0, lastpar + 1 is returned. If
        /// such paragraph cannot be found because there isn't a par
        /// with less depth before this one, \p par is returned.
-       pit_type outerHook(pit_type par) const;
+       pit_type outerHook(pit_type pit) const;
        /// Is it the first par with same depth and layout?
-       bool isFirstInSequence(pit_type par) const;
+       bool isFirstInSequence(pit_type pit) const;
+       /// Return the last paragraph with same depth and layout, or a strictly
+       /// greater depth
+       pit_type lastInSequence(pit_type pit) const;
        /// Is this paragraph in the table of contents?
-       int getTocLevel(pit_type par) const;
+       int getTocLevel(pit_type pit) const;
        /// Get the font of the "environment" of paragraph \p par_offset in \p pars.
        /// All font changes of the paragraph are relative to this font.
-       Font const outerFont(pit_type par_offset) const;
+       Font const outerFont(pit_type pit_offset) const;
 
 private:
        /// The InsetText owner shall have access to everything.
        friend class InsetText;
 
-       // fix the cursor `cur' after a characters has been deleted at `where'
-       // position. Called by deleteEmptyParagraphMechanism
-       static void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
-
        // At cursor position 0, try to merge the paragraph with the one before it.
        // Ignore change tracking, i.e., physically remove the end-of-par character
        bool backspacePos0(Cursor & cur);
@@ -383,7 +385,7 @@ private:
 ///
 void breakParagraphConservative(BufferParams const & bparams,
                                ParagraphList & paragraphs,
-                               pit_type par,
+                               pit_type pit,
                                pos_type pos);
 
 /**
@@ -391,7 +393,7 @@ void breakParagraphConservative(BufferParams const & bparams,
  * Be careful, this doesent make any check at all.
  */
 void mergeParagraph(BufferParams const & bparams,
-       ParagraphList & paragraphs, pit_type par);
+       ParagraphList & paragraphs, pit_type pit);
 
 /// accept the changes within the complete ParagraphList
 void acceptChanges(ParagraphList & pars, BufferParams const & bparams);