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

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 29b201d3809a2eeb2c485d6d8f4613a316a0b64d..9523a23a7cb73464533ad78c28294a8a451620e6 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -167,8 +167,10 @@ public:
        void clearContents();
 
        ///
-       lyx::layout_type layout;
-
+       string const & layout() const;
+       ///
+       void layout(string const & new_layout);
+       
        ///
        void setCounter(int i, int v);
        ///
@@ -218,15 +220,13 @@ public:
        ///
        void setLabelWidthString(string const & s);
        ///
-       lyx::layout_type getLayout() const;
-       ///
        char getAlign() const;
-       ///
+       /// The nesting depth of a paragraph
        depth_type getDepth() const;
+       /// The maximal possible depth of a paragraph after this one
+       depth_type getMaxDepthAfter(Buffer const *) const;
        ///
-       void setLayout(lyx::layout_type new_layout);
-       ///
-       void setOnlyLayout(lyx::layout_type new_layout);
+       void applyLayout(string const & new_layout);
        ///
        int getFirstCounter(int i) const;
        ///
@@ -309,11 +309,6 @@ public:
        /// 
        bool isWord(lyx::pos_type pos) const;
 
-       /** This one resets all layout and dtp switches but not the font
-           of the single characters
-       */ 
-       void clear();
-
        /** paste this paragraph with the next one
            be carefull, this doesent make any check at all
        */ 
@@ -345,7 +340,8 @@ public:
        ParagraphParameters & params();
        ParagraphParameters const & params() const;
 private:
-       
+       ///
+       string layout_;
        ///
        struct InsetTable {
                ///