Patch from Juergen Spitzmueller

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index c57b4aee50fd73e3b0582fc09af928c50293b948..067cde79e0359b4f46acb0ae6005ea6279497f59 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-30  Juergen Spitzmueller <j.spitzmueller@gmx.de>
+
+        * insetfloat.C: fix bug with float settings
+        (document default != float default).
+
 2002-09-24  Dekel Tsur  <dekelts@tau.ac.il>
 
        * insetwrap.C (addToToc): New method.

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 24c196a0701360800663a77ffe0b45312128b3ab..ac8dcd9d3a578c46aa4e3341aa423cb50f3d7f98 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -240,7 +240,8 @@ int InsetFloat::latex(Buffer const * buf,
        if (!floatPlacement_.empty()
            && floatPlacement_ != def_placement) {
                placement = floatPlacement_;
-       } else if (!buf_placement.empty()
+       } else if (floatPlacement_.empty() 
+                  && !buf_placement.empty()
                   && buf_placement != def_placement) {
                placement = buf_placement;
        }