again some things which cherry pick did not catch, sorry

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index e3421e2e5f52183c67df98b326e75d27fec2af23..6068025192dc57f6550c594b42fc2dcf0ade76fc 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -66,14 +66,12 @@ public:
                Font const & font, Font const & display_font);
 
        /** Needed to propagate font changes to all text cells of insets
-        *  that are not allowed inside a font change (bug 1973).
+        *  that are not allowed inside a font change (bugs 1973, 6919).
         *  Must not be called if \p pos denotes an ordinary character or an
         *  inset that is alowed inside a font change.
-        *  FIXME: This should be removed, see documentation of noFontChange
-        *  in insetbase.h
         */
        void setInsetFont(BufferView const & bv, pit_type pit, pos_type pos,
-               Font const & font, bool toggleall = false);
+               Font const & font);
 
        /// what you expect when pressing \<enter\> at cursor position
        /// \param inverse_logic if false, the same layout is set for the
@@ -106,8 +104,7 @@ public:
        void setFont(Cursor & cur, Font const &, bool toggleall = false);
        /// Set font from \p begin to \p end and rebreak.
        void setFont(BufferView const & bv, CursorSlice const & begin,
-               CursorSlice const & end, Font const &,
-               bool toggleall = false);
+               CursorSlice const & end, Font const &);
 
        ///
        void toggleFree(Cursor & cur, Font const &, bool toggleall = false);
@@ -126,6 +123,14 @@ public:
        ///
        docstring asString(pit_type beg, pit_type end,
                int options = AS_STR_NONE) const;
+       /// 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 we will shorten
+       /// \param os to maxlen chars and replace the final three by "...,
+       /// if \param os is longer than maxlen chars.
+       /// if \param maxlen is passed as 0, then it is ignored. (In fact,
+       /// it is reset to the maximum value for size_t.)
+       void forToc(docstring & os, size_t maxlen, bool shorten = true) const;
 
        /// insert a character at cursor position
        /// FIXME: replace Cursor with DocIterator.
@@ -259,10 +264,10 @@ public:
        /* these things are for search and replace */
 
        /// needed to insert the selection
-       void insertStringAsLines(DocIterator const & dit, docstring const & str,
+       void insertStringAsLines(Cursor & cur, docstring const & str,
                Font const & font);
        /// needed to insert the selection
-       void insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+       void insertStringAsParagraphs(Cursor & cur, docstring const & str,
                Font const & font);
 
        /// access to our paragraphs