Fix deleting of paragraphs after undo (fix #236).

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index f80c84b7d0698c610154413e0fb296fda12f8dee..18812862ca2d0f6c9ec31331ae8b444d34eeb880 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -85,7 +85,7 @@ public:
        mutable LyXFont real_current_font;
        /// first visible pixel-row is set from LyXScreen!!!
        // unsigned is wrong here for text-insets!
-       int first;
+       int first_y;
        ///
        BufferView * bv_owner;
        ///
@@ -107,8 +107,6 @@ public:
                         lyx::pos_type pos, LyXFont const & font);
        void setCharFont(BufferView *, Paragraph * par,
                         lyx::pos_type pos, LyXFont const & font, bool toggleall);
-       /// returns a pointer to the very first Paragraph
-       Paragraph * firstParagraph() const;
   
        /// what you expect when pressing <enter> at cursor position
        void breakParagraph(BufferView *, char keep_layout = 0);
@@ -117,11 +115,11 @@ public:
          those paragraphs
          */
        Paragraph * setLayout(BufferView *, LyXCursor & actual_cursor,
-                                LyXCursor & selection_start,
-                                LyXCursor & selection_end,
-                                lyx::layout_type layout);
+                             LyXCursor & selection_start,
+                             LyXCursor & selection_end,
+                             string const & layout);
        ///
-       void setLayout(BufferView *, lyx::layout_type layout);
+       void setLayout(BufferView *, string const & layout);
        
        /// used in setlayout
        void makeFontEntriesLayoutSpecific(Buffer const *, Paragraph * par);
@@ -509,15 +507,15 @@ public:
 private:
        ///
        mutable Row * firstrow;
+
        ///
        mutable Row * lastrow;
-
+       
        /** Copybuffer for copy environment type.
          Asger has learned that this should be a buffer-property instead
          Lgb has learned that 'char' is a lousy type for non-characters
          */
-       lyx::layout_type copylayouttype;
-
+       string copylayouttype;
        /** inserts a new row behind the specified row, increments
            the touched counters */
        void insertRow(Row * row, Paragraph * par, lyx::pos_type pos) const;