fix crash when collapsing ert with cursor inside

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 5153b1e5149bf7b05952bf0c6d92e6e0d09bd44a..a8563e083ec5ad89db7279556b4f7219592967ba 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -60,6 +60,8 @@ public:
        ///
        LyXFont getFont(Paragraph const & par, pos_type pos) const;
        ///
+       void applyOuterFont(LyXFont &) const;
+       ///
        LyXFont getLayoutFont(pit_type pit) const;
        ///
        LyXFont getLabelFont(Paragraph const & par) const;
@@ -261,8 +263,6 @@ public:
        /// current text heigth
        int height() const;
 
-       /// updates all counters
-       void updateCounters();
        /// Returns an inset if inset was hit, or 0 if not.
        InsetBase * checkInsetHit(int x, int y) const;
 
@@ -338,7 +338,7 @@ public:
        LyXFont current_font;
        /// the current font
        LyXFont real_current_font;
-       /// our buffer's default layout font
+       /// our buffer's default layout font. This is textclass specific
        LyXFont defaultfont_;
        ///
        int background_color_;
@@ -351,7 +351,8 @@ public:
        ///
        ParagraphList pars_;
 
-       /// our 'outermost' Font
+       /// our 'outermost' font. This is handed down from the surrounding
+       // inset through the pi/mi parameter (pi.base.font)
        LyXFont font_;
 
        ///
@@ -374,8 +375,6 @@ private:
        /// delete double space or empty paragraphs around old cursor
        bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor const & old);
 
-       ///
-       void setCounter(Buffer const &, pit_type pit);
        ///
        void deleteWordForward(LCursor & cur);
        ///
@@ -402,9 +401,4 @@ private:
 /// return the default height of a row in pixels, considering font zoom
 int defaultRowHeight();
 
-///
-std::string expandLabel(LyXTextClass const & textclass,
-               LyXLayout_ptr const & layout, bool appendix);
-
-
 #endif // LYXTEXT_H