form para crash fix from John

[lyx.git] / src / ParameterStruct.h

diff --git a/src/ParameterStruct.h b/src/ParameterStruct.h
index 86bc6f1e15f43d2151cd3a34134f97c6cf42f6f7..51a8bd37feb549bbae9ad21df23b5af337d2263d 100644 (file)
--- a/src/ParameterStruct.h
+++ b/src/ParameterStruct.h
@@ -7,8 +7,16 @@
 #include "Spacing.h"
 #include "layout.h"
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 ///
 struct ParameterStruct {
+       ///
+       ParameterStruct();
+       ///
+       typedef unsigned int depth_type;
        ///
        VSpace added_space_top;
        ///
@@ -28,7 +36,7 @@ struct ParameterStruct {
        ///
        LyXAlignment align;
        ///
-       char depth; // wrong type (Lgb)
+       depth_type depth; 
        ///
        bool start_of_appendix;
        ///
@@ -37,6 +45,7 @@ struct ParameterStruct {
        string labelstring;
        ///
        string labelwidthstring;
+#ifndef NO_PEXTRA_REALLY
         ///
         int pextra_type;
         ///
@@ -49,9 +58,23 @@ struct ParameterStruct {
         bool pextra_hfill;
         ///
         bool pextra_start_minipage;
+#endif
 };
 
 
+inline
+ParameterStruct::ParameterStruct()
+       : noindent(false), line_top(false), line_bottom(false),
+         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) 
@@ -70,12 +93,16 @@ 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;
+               && ps1.pextra_start_minipage == ps2.pextra_start_minipage
+#endif
+       ;
+       
 }
 
 #endif