couple more fixes

[lyx.git] / src / ParameterStruct.h

diff --git a/src/ParameterStruct.h b/src/ParameterStruct.h
index 51a8bd37feb549bbae9ad21df23b5af337d2263d..9a766d027ed8886e1e0f1e2a43a99e80ac114c6b 100644 (file)
--- a/src/ParameterStruct.h
+++ b/src/ParameterStruct.h
@@ -6,6 +6,7 @@
 #include "vspace.h"
 #include "Spacing.h"
 #include "layout.h"
+#include "lyxlength.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -36,7 +37,7 @@ struct ParameterStruct {
        ///
        LyXAlignment align;
        ///
-       depth_type depth; 
+       depth_type depth;
        ///
        bool start_of_appendix;
        ///
@@ -45,20 +46,8 @@ struct ParameterStruct {
        string labelstring;
        ///
        string labelwidthstring;
-#ifndef NO_PEXTRA_REALLY
-        ///
-        int pextra_type;
-        ///
-        string pextra_width;
-        ///
-        string pextra_widthp;
-        ///
-        int pextra_alignment;
-        ///
-        bool pextra_hfill;
-        ///
-        bool pextra_start_minipage;
-#endif
+       ///
+       LyXLength leftindent;
 };
 
 
@@ -68,16 +57,12 @@ ParameterStruct::ParameterStruct()
          pagebreak_top(false), pagebreak_bottom(false),
          align(LYX_ALIGN_BLOCK), depth(0), start_of_appendix(false),
          appendix(false)
-#ifndef NO_PEXTRA_REALLY
-       , pextra_type(0), pextra_alignment(0), pextra_hfill(false),
-       pextra_start_minipage(false)
-#endif
 {}
 
 
 inline
 bool operator==(ParameterStruct const & ps1,
-               ParameterStruct const & ps2) 
+               ParameterStruct const & ps2)
 {
        return ps1.added_space_top == ps2.added_space_top
                && ps1.added_space_bottom == ps2.added_space_bottom
@@ -93,16 +78,8 @@ bool operator==(ParameterStruct const & ps1,
                && ps1.appendix == ps2.appendix
                && ps1.labelstring == ps2.labelstring
                && ps1.labelwidthstring == ps2.labelwidthstring
-#ifndef NO_PEXTRA_REALLY
-               && ps1.pextra_type == ps2.pextra_type
-               && ps1.pextra_width == ps2.pextra_width
-               && ps1.pextra_widthp == ps2.pextra_widthp
-               && ps1.pextra_alignment == ps2.pextra_alignment
-               && ps1.pextra_hfill == ps2.pextra_hfill
-               && ps1.pextra_start_minipage == ps2.pextra_start_minipage
-#endif
-       ;
-       
+               && ps1.leftindent == ps2.leftindent;
+
 }
 
 #endif