X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.C;h=ca780ada6b3e009b29e6a1cbb106648750be9619;hb=69cf3b62043861ccad5f8ad7ffb4981fe50b078d;hp=d5a37e6875cfb8895881a13458d7f216fbcaa97a;hpb=03d1c984a0b22ec123cb86ba9004d9172a4190fb;p=lyx.git

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index d5a37e6875..ca780ada6b 100644
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -1,4 +1,3 @@
-
 #include <config.h>
 
 #include "ParagraphParameters.h"
@@ -10,9 +9,6 @@ ShareContainer<ParameterStruct> ParagraphParameters::container;
 ParagraphParameters::ParagraphParameters()
 {
 	ParameterStruct tmp;
-	tmp.appendix = false;
-	tmp.align = LYX_ALIGN_BLOCK;
-
 	set_from_struct(tmp);
 }
 
@@ -33,15 +29,6 @@ void ParagraphParameters::clear()
 	tmp.labelstring.erase();
 	tmp.labelwidthstring.erase();
 	tmp.start_of_appendix = 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;
-
 	set_from_struct(tmp);
 }
 
@@ -57,43 +44,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 &&
-		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->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;
-	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;
-	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);
@@ -226,13 +182,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;
@@ -296,85 +246,16 @@ void ParagraphParameters::labelWidthString(string const & lws)
 }
 
 
-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
-{
-	return param->pextra_width;
-}
-
-
-void ParagraphParameters::pextraWidth(string const & w)
-{
-	ParameterStruct tmp(*param);
-	tmp.pextra_width = w;
-	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
+LyXLength const & ParagraphParameters::leftIndent() const
 {
-	return param->pextra_start_minipage;
+	return param->leftindent;
 }
 
 
-void ParagraphParameters::pextraStartMinipage(bool smp)
+void ParagraphParameters::leftIndent(LyXLength const & li)
 {
 	ParameterStruct tmp(*param);
-	tmp.pextra_start_minipage = smp;
+	tmp.leftindent = li;
 	set_from_struct(tmp);
 }