Herbert's patch, part 1

[lyx.git] / src / ParagraphParameters.C

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index d5a37e6875cfb8895881a13458d7f216fbcaa97a..57912b441bd0e6f9531e5af3cb69397cdc8c2a75 100644 (file)
--- 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);
 }
 
@@ -33,6 +35,7 @@ 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();
@@ -41,7 +44,7 @@ void ParagraphParameters::clear()
         tmp.pextra_alignment = 0;
         tmp.pextra_hfill = false;
         tmp.pextra_start_minipage = false;
-
+#endif
        set_from_struct(tmp);
 }
 
@@ -57,42 +60,19 @@ 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 && 
+                param->pextra_start_minipage == pp.param->pextra_start_minipage &&
+#endif
                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) 
 {
        // get new param from container with tmp as template
@@ -226,13 +206,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;
@@ -295,7 +269,7 @@ void ParagraphParameters::labelWidthString(string const & lws)
        set_from_struct(tmp);
 }
 
-
+#ifndef NO_PEXTRA_REALLY
 int ParagraphParameters::pextraType() const
 {
        return param->pextra_type;
@@ -378,3 +352,4 @@ void ParagraphParameters::pextraStartMinipage(bool smp)
        tmp.pextra_start_minipage = smp;
        set_from_struct(tmp);
 }
+#endif