From fbb788ccb520f4e7a4a08b3171fbedcdcf53eda0 Mon Sep 17 00:00:00 2001 From: Dekel Tsur Date: Thu, 26 Sep 2002 08:59:34 +0000 Subject: [PATCH] Patch from Juergen Spitzmueller git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5348 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 5 +++++ src/insets/insetfloat.C | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index c57b4aee50..067cde79e0 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2002-07-30 Juergen Spitzmueller + + * insetfloat.C: fix bug with float settings + (document default != float default). + 2002-09-24 Dekel Tsur * insetwrap.C (addToToc): New method. diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index 24c196a070..ac8dcd9d3a 100644 --- 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; } -- 2.39.2