Revert 23154.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 9de84bf057361b1fdfc5964afb08a18ddc2cc429..3c9e533562d0bf2e6959df1a973727609a0df5a7 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -21,10 +21,8 @@
 
 #include "insets/InsetCode.h"
 
-#include "support/docstring.h"
-// FIXME: would be nice to forward declare odocstream instead of
-// including this:
-#include "support/docstream.h"
+#include "support/strfwd.h"
+#include "support/types.h"
 
 namespace lyx {
 
@@ -45,6 +43,7 @@ class MetricsInfo;
 class OutputParams;
 class PainterInfo;
 class ParagraphParameters;
+class TextClass;
 class TexRow;
 
 
@@ -147,8 +146,11 @@ public:
        ///
        InsetCode ownerCode() const;
        ///
-       bool forceDefaultParagraphs() const;
-
+       bool forceEmptyLayout() const;
+       ///
+       bool allowParagraphCustomization() const;
+       ///
+       bool useEmptyLayout() const;
        ///
        pos_type size() const;
        ///
@@ -157,7 +159,9 @@ public:
        ///
        LayoutPtr const & layout() const;
        ///
-       void layout(LayoutPtr const & new_layout);
+       void setLayout(LayoutPtr const & layout);
+       ///
+       void setEmptyOrDefaultLayout(TextClass const & tc);
 
        /// This is the item depth, only used by enumerate and itemize
        signed char itemdepth;
@@ -200,7 +204,7 @@ public:
        void setBeginOfBody();
 
        ///
-       docstring const & getLabelstring() const;
+       docstring const & labelString() const;
 
        /// the next two functions are for the manual labels
        docstring const getLabelWidthString() const;
@@ -352,7 +356,7 @@ public:
 
        ///
        void changeCase(BufferParams const & bparams, pos_type pos,
-               pos_type right, TextCase action);
+               pos_type & right, TextCase action);
 
        /// find \param str string inside Paragraph.
        /// \return true if the specified string is at the specified position