Fix layout bug. Pasting text into a cell tried to set Standard layout, because

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index 6fab4d7a492c2c8570e03f8bdb6071ff20a2b020..bf7a6429fea07885c218203e509a83dc16ec6b14 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -12,8 +12,6 @@
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
-#include "ParagraphList_fwd.h"
-
 #include "support/types.h"
 
 
@@ -21,24 +19,23 @@ namespace lyx {
 
 class Buffer;
 class BufferParams;
-class InsetBase;
-class LyXFont;
+class Inset;
+class Font;
 class Paragraph;
+class ParagraphList;
 
 /**
  * This breaks a paragraph at the specified position.
  * The new paragraph will:
- * get the default layout, when flag == 0
- * will inherit the existing one, except for depth, when flag == 1
- * will inherit the existing one, including depth, when flag == 2
- * Be aware that the old or new paragraph does not contain any rows
- * after this.
+ * - Decrease depth by one (or change layout to default layout) when
+ *    keep_layout == false  
+ * - keep current depth and layout when keep_layout == true
  */
 void breakParagraph(BufferParams const & bparams,
                    ParagraphList & paragraphs,
                    pit_type par,
                    pos_type pos,
-                   int flag);
+                   bool keep_layout);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
@@ -71,10 +68,10 @@ int getEndLabel(pit_type par, ParagraphList const & plist);
  * Get the font of the "environment" of paragraph \p par_offset in \p pars.
  * All font changes of the paragraph are relative to this font.
  */
-LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars);
+Font const outerFont(pit_type par_offset, ParagraphList const & pars);
 
-/// return the number of InsetOptArg in a paragraph
-int numberOfOptArgs(Paragraph const & par);
+/// accept the changes within the complete ParagraphList
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams);
 
 
 } // namespace lyx