X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.C;h=3542cb1bb8955961ec8556f90349d84157ce8b18;hb=d11fd01ce743c4974a96f241a99853f46078c80c;hp=e7799beb6f0c7ebb70baf0e12bfea17a39d707f2;hpb=1a32c26a5ee4af362e249418dc6d441b7ab5d695;p=lyx.git

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index e7799beb6f..3542cb1bb8 100644
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -1,6 +1,10 @@
-
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#pragma implementation "ParameterStruct.h"
+#endif
+
 #include "ParagraphParameters.h"
 #include "ParameterStruct.h"
 
@@ -10,9 +14,6 @@ ShareContainer<ParameterStruct> ParagraphParameters::container;
 ParagraphParameters::ParagraphParameters()
 {
 	ParameterStruct tmp;
-	tmp.appendix = false;
-	tmp.align = LYX_ALIGN_BLOCK;
-
 	set_from_struct(tmp);
 }
 
@@ -34,14 +35,14 @@ void ParagraphParameters::clear()
 	tmp.labelwidthstring.erase();
 	tmp.start_of_appendix = false;
 #ifndef NO_PEXTRA_REALLY
-        //tmp.pextra_type = PEXTRA_NONE;
-        tmp.pextra_type = 0;
-        tmp.pextra_width.erase();
-        tmp.pextra_widthp.erase();
-        //tmp.pextra_alignment = MINIPAGE_ALIGN_TOP;
-        tmp.pextra_alignment = 0;
-        tmp.pextra_hfill = false;
-        tmp.pextra_start_minipage = false;
+	//tmp.pextra_type = PEXTRA_NONE;
+	tmp.pextra_type = 0;
+	tmp.pextra_width.erase();
+	tmp.pextra_widthp.erase();
+	//tmp.pextra_alignment = MINIPAGE_ALIGN_TOP;
+	tmp.pextra_alignment = 0;
+	tmp.pextra_hfill = false;
+	tmp.pextra_start_minipage = false;
 #endif
 	set_from_struct(tmp);
 }
@@ -57,48 +58,21 @@ bool ParagraphParameters::sameLayout(ParagraphParameters const & pp) const
 		param->line_top == pp.param->line_top &&
 		param->pagebreak_top == pp.param->pagebreak_top &&
 		param->added_space_top == pp.param->added_space_top &&
-#ifndef NO_PEXTRA_REALLY
 		param->spacing == pp.param->spacing &&
+#ifndef NO_PEXTRA_REALLY
 		param->pextra_type == pp.param->pextra_type &&
-                param->pextra_width == pp.param->pextra_width && 
-                param->pextra_widthp == pp.param->pextra_widthp &&
-                param->pextra_alignment == pp.param->pextra_alignment && 
-                param->pextra_hfill == pp.param->pextra_hfill && 
-                param->pextra_start_minipage == pp.param->pextra_start_minipage &&
+		param->pextra_width == pp.param->pextra_width &&
+		param->pextra_widthp == pp.param->pextra_widthp &&
+		param->pextra_alignment == pp.param->pextra_alignment &&
+		param->pextra_hfill == pp.param->pextra_hfill &&
+		param->pextra_start_minipage == pp.param->pextra_start_minipage &&
 #endif
 		param->noindent == pp.param->noindent &&
 		param->depth == pp.param->depth;
 }
 
 
-void ParagraphParameters::makeSame(ParagraphParameters const & pp)
-{
-	ParameterStruct tmp(*param);
-	tmp.align = pp.param->align;
-	// tmp.labelwidthstring = pp.params.labelwidthstring;
-	tmp.line_bottom = pp.param->line_bottom;
-	tmp.pagebreak_bottom = pp.param->pagebreak_bottom;
-	tmp.added_space_bottom = pp.param->added_space_bottom;
-	tmp.line_top = pp.param->line_top;
-	tmp.pagebreak_top = pp.param->pagebreak_top;
-	tmp.added_space_top = pp.param->added_space_top;
-	tmp.spacing = pp.param->spacing;
-#ifndef NO_PEXTRA_REALLY
-	tmp.pextra_type = pp.param->pextra_type;
-	tmp.pextra_width = pp.param->pextra_width;
-	tmp.pextra_widthp = pp.param->pextra_widthp;
-	tmp.pextra_alignment = pp.param->pextra_alignment;
-	tmp.pextra_hfill = pp.param->pextra_hfill;
-	tmp.pextra_start_minipage = pp.param->pextra_start_minipage;
-#endif
-	tmp.noindent = pp.param->noindent;
-	tmp.depth = pp.param->depth;
-
-	set_from_struct(tmp);
-}
-
-
-void ParagraphParameters::set_from_struct(ParameterStruct const & ps) 
+void ParagraphParameters::set_from_struct(ParameterStruct const & ps)
 {
 	// get new param from container with tmp as template
 	param = container.get(ps);
@@ -231,13 +205,7 @@ void ParagraphParameters::align(LyXAlignment la)
 }
 
 
-char ParagraphParameters::depth() const
-{
-	return param->depth;
-}
-
-
-void ParagraphParameters::depth(char d)
+void ParagraphParameters::depth(depth_type d)
 {
 	ParameterStruct tmp(*param);
 	tmp.depth = d;