X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.C;h=57912b441bd0e6f9531e5af3cb69397cdc8c2a75;hb=8d1c58af82d1fc356f470dff97878ab7c3e8a2fe;hp=8f73b952d166a15e6286e30bb1decefaf3ddf994;hpb=b17500c1c47d7bdd4508743c27fb72f0e57a5105;p=lyx.git

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 8f73b952d1..57912b441b 100644
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -1,6 +1,11 @@
 
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#pragma implementation "ParameterStruct.h"
+#endif
+
 #include "ParagraphParameters.h"
 #include "ParameterStruct.h"
 
@@ -10,9 +15,6 @@ ShareContainer<ParameterStruct> ParagraphParameters::container;
 ParagraphParameters::ParagraphParameters()
 {
 	ParameterStruct tmp;
-	tmp.appendix = false;
-	tmp.align = LYX_ALIGN_BLOCK;
-
 	set_from_struct(tmp);
 }
 
@@ -57,8 +59,8 @@ 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 &&
@@ -71,33 +73,6 @@ bool ParagraphParameters::sameLayout(ParagraphParameters const & pp) const
 }
 
 
-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) 
 {
 	// get new param from container with tmp as template
@@ -231,7 +206,7 @@ void ParagraphParameters::align(LyXAlignment la)
 }
 
 
-void ParagraphParameters::depth(char d)
+void ParagraphParameters::depth(depth_type d)
 {
 	ParameterStruct tmp(*param);
 	tmp.depth = d;