X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.C;h=5ec3e9bf961b57fc657e90a09c1a7ed5ed3820f0;hb=29f01faa17495e3d80c08f234c8f049c7d699ac1;hp=b1be00bf780814d75e4c8f6c451219f8c7d8061e;hpb=bf6257967e48709d375d5b8aa1cdd66c7f7bc25a;p=lyx.git

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index b1be00bf78..5ec3e9bf96 100644
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -1,4 +1,3 @@
-
 #include <config.h>
 
 #ifdef __GNUG__
@@ -15,10 +14,6 @@ ShareContainer<ParameterStruct> ParagraphParameters::container;
 ParagraphParameters::ParagraphParameters()
 {
 	ParameterStruct tmp;
-#if 0
-	tmp.appendix = false;
-	tmp.align = LYX_ALIGN_BLOCK;
-#endif
 	set_from_struct(tmp);
 }
 
@@ -39,16 +34,6 @@ void ParagraphParameters::clear()
 	tmp.labelstring.erase();
 	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;
-#endif
 	set_from_struct(tmp);
 }
 
@@ -64,20 +49,12 @@ bool ParagraphParameters::sameLayout(ParagraphParameters const & pp) const
 		param->pagebreak_top == pp.param->pagebreak_top &&
 		param->added_space_top == pp.param->added_space_top &&
 		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 &&
-#endif
 		param->noindent == pp.param->noindent &&
 		param->depth == pp.param->depth;
 }
 
 
-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);
@@ -273,87 +250,17 @@ void ParagraphParameters::labelWidthString(string const & lws)
 	set_from_struct(tmp);
 }
 
-#ifndef NO_PEXTRA_REALLY
-int ParagraphParameters::pextraType() const
-{
-	return param->pextra_type;
-}
-
 
-void ParagraphParameters::pextraType(int t)
-{
-	ParameterStruct tmp(*param);
-	tmp.pextra_type = t;
-	set_from_struct(tmp);
-}
 
-
-string const & ParagraphParameters::pextraWidth() const
+LyXLength const & ParagraphParameters::leftIndent() const
 {
-	return param->pextra_width;
+	return param->leftindent;
 }
 
 
-void ParagraphParameters::pextraWidth(string const & w)
+void ParagraphParameters::leftIndent(LyXLength const & li)
 {
 	ParameterStruct tmp(*param);
-	tmp.pextra_width = w;
+	tmp.leftindent = li;
 	set_from_struct(tmp);
 }
-
-
-string const & ParagraphParameters::pextraWidthp() const
-{
-	return param->pextra_widthp;
-}
-
-
-void ParagraphParameters::pextraWidthp(string const & wp)
-{
-	ParameterStruct tmp(*param);
-	tmp.pextra_widthp = wp;
-	set_from_struct(tmp);
-}
-
-
-int ParagraphParameters::pextraAlignment() const
-{
-	return param->pextra_alignment;
-}
-
-
-void ParagraphParameters::pextraAlignment(int a)
-{
-	ParameterStruct tmp(*param);
-	tmp.pextra_alignment = a;
-	set_from_struct(tmp);
-}
-
-
-bool ParagraphParameters::pextraHfill() const
-{
-	return param->pextra_hfill;
-}
-
-
-void ParagraphParameters::pextraHfill(bool hf)
-{
-	ParameterStruct tmp(*param);
-	tmp.pextra_hfill = hf;
-	set_from_struct(tmp);
-}
-
-
-bool ParagraphParameters::pextraStartMinipage() const
-{
-	return param->pextra_start_minipage;
-}
-
-
-void ParagraphParameters::pextraStartMinipage(bool smp)
-{
-	ParameterStruct tmp(*param);
-	tmp.pextra_start_minipage = smp;
-	set_from_struct(tmp);
-}
-#endif