Do not crash when entering math in ct mode with merge dialog open.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 97d36dc443b659667b28a076281ef0ba584ffe8f..955804871b2e04eb159d06000cc47bf767c70c0f 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -127,8 +127,7 @@ enum AsStringParameter
        AS_STR_LABEL = 1, ///< Prefix with paragraph label.
        AS_STR_INSETS = 2, ///< Go into insets.
        AS_STR_NEWLINES = 4, ///< Get also newline characters.
-       AS_STR_SKIPDELETE = 8, ///< Skip deleted text in change tracking.
-       AS_STR_PLAINTEXT = 16 ///< Extract only the explicitly visible text (without any formatting), when descending into insets
+       AS_STR_SKIPDELETE = 8 ///< Skip deleted text in change tracking.
 };
 
 
@@ -176,11 +175,15 @@ public:
        docstring asString(int options = AS_STR_NONE) const;
        ///
        docstring asString(pos_type beg, pos_type end,
-                          int options = AS_STR_NONE,
-                          const OutputParams *p_runparams = 0) const;
+               int options = AS_STR_NONE) const;
        ///
        void forToc(docstring &, size_t maxlen) const;
 
+       /// Extract only the explicitly visible text (without any formatting),
+       /// descending into insets
+       docstring stringify(pos_type beg, pos_type end, int options,
+               OutputParams const & runparams) const;
+
        ///
        void write(std::ostream &, BufferParams const &,
                depth_type & depth) const;