another fix

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index ae7fb0ae0aa0d0eeab69b105e4fdd05a7fb3bbe8..5aa9b0984d44302078870eba397043d2bf12d41c 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-08  John Levon  <levon@movementarian.org>
+
+       * QFloat.C: another fix
+ 
 2002-09-08  John Levon  <levon@movementarian.org>
 
        * QFloat.h:

diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C
index ca85bc9b5240e7595483f5d89cf826b01d074346..6b26ac94bb307628cc2a402860dd45092fa17e10 100644 (file)
--- a/src/frontends/qt2/QFloat.C
+++ b/src/frontends/qt2/QFloat.C
@@ -105,6 +105,13 @@ void QFloat::update_contents()
  
 void QFloat::apply()
 {
+       controller().params().wide = dialog_->spanCB->isChecked(); 
+
+       if (dialog_->defaultsCB->isChecked()) {
+               controller().params().placement = "";
+               return;
+       }
+ 
        string placement;
 
        if (dialog_->heredefinitelyCB->isChecked()) {
@@ -127,5 +134,4 @@ void QFloat::apply()
                }
        }
        controller().params().placement = placement;
-       controller().params().wide = dialog_->spanCB->isChecked(); 
 }