John's paragraph spacing patch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2661 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 790d8e0ab6cdc039f7f2b81aa33c02a42958e99a..1d6bd32179344271f82f93fe48e464bb8780fb58 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-02  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormParagraph.C: fix default line spacing case
+ 
 2001-08-31  John Levon  <moz@compsoc.man.ac.uk>
 
        * FormParagraph.C: disable space inputs when != Length

diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index f2d171e4b9d66b892d8107140cd0caa4882a0c4d..2085822a1d504575b8094d2d61bae1ef4b206209 100644 (file)
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -333,33 +333,19 @@ void FormParagraph::update()
                  par_->params().noindent());
 
     int linespacing;
-    Spacing space = par_->params().spacing();
-
-    /* 
-    switch (lv_->buffer()->params.spacing.getSpace()) {
-        case Spacing::Default: linespacing = 1; break;
-        case Spacing::Single: linespacing = 2; break;
-        case Spacing::Onehalf: linespacing = 3; break;
-        case Spacing::Double: linespacing = 4; break;
-        case Spacing::Other: linespacing = 5; break;
-    }
-    */
+    Spacing const space = par_->params().spacing();
 
     switch (space.getSpace()) {
-        case Spacing::Default: linespacing = 1; break;
+        default: linespacing = 1; break;
         case Spacing::Single: linespacing = 2; break;
         case Spacing::Onehalf: linespacing = 3; break;
         case Spacing::Double: linespacing = 4; break;
         case Spacing::Other: linespacing = 5; break;
     }
+ 
     fl_set_choice(dialog_->choice_linespacing, linespacing);
     if (space.getSpace() == Spacing::Other) {
-        string sp;
-        
-        if (space.getSpace() == Spacing::Default)
-            sp = tostr(lv_->buffer()->params.spacing.getValue());
-        else 
-            sp = tostr(space.getValue());
+        string const sp = tostr(space.getValue());
         fl_set_input(dialog_->input_linespacing, sp.c_str());
         setEnabled(dialog_->input_linespacing, true);
     } else {