Flotsam from Michael Schmidt's VSpace fixes...

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

diff --git a/src/frontends/qt2/QVSpace.C b/src/frontends/qt2/QVSpace.C
index 9fa7e46fddf813bc0570aac2a3491b81fd1b4a66..76b3888292fe950e5227e1de8e0f314a7bd5855e 100644 (file)
--- a/src/frontends/qt2/QVSpace.C
+++ b/src/frontends/qt2/QVSpace.C
@@ -93,7 +93,7 @@ VSpace setVSpaceFromWidgets(int spacing,
                            LengthCombo * unit,
                            bool keep)
 {
-       VSpace space = VSpace(VSpace::DEFSKIP);
+       VSpace space;
 
        switch (spacing) {
        case 0:
@@ -157,7 +157,7 @@ void QVSpace::apply()
        // spacing
        // If a vspace choice is "Length" but there's no text in
        // the input field, do not insert a vspace at all.
-       if (dialog_->spacingCO->currentItem() == 6
+       if (dialog_->spacingCO->currentItem() == 5
            && dialog_->valueLE->text().isEmpty())
                return;
 

diff --git a/src/frontends/xforms/FormVSpace.C b/src/frontends/xforms/FormVSpace.C
index 143ada2f31257666d6ea0150a69bde8f01ca4f98..20413130e683a6105cc65a100dc8826fc217b1bc 100644 (file)
--- a/src/frontends/xforms/FormVSpace.C
+++ b/src/frontends/xforms/FormVSpace.C
@@ -75,7 +75,7 @@ VSpace const setVSpaceFromWidgets(FL_OBJECT * choice_type,
                     input_length  && input_length->objclass  == FL_INPUT &&
                     choice_length && choice_length->objclass == FL_CHOICE);
 
-       VSpace space = VSpace(VSpace::DEFSKIP);
+       VSpace space;
 
        switch (fl_get_choice(choice_type)) {
        case 1: