From aa97bf08661d61dbd85071ff4ea5a3f7694a35f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 15 Jul 2005 13:51:41 +0000 Subject: [PATCH] bug 313 dont reset the layout on keepEmpty paragraphs git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10208 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 3 +++ src/paragraph_funcs.C | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f50c4d3816..e1cadd9cba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2005-07-15 + * paragraph_funcs.C (breakParagraph): dont reset the layout on + keepEmpty paragraphs + * text.C (setCursorFromCoordinates): add a debug statement * text2.C (getColumnNearX): bug 1825 make sure that we don't diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index 7acc817580..2cb63eaa38 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -168,10 +168,11 @@ void breakParagraph(BufferParams const & bparams, return; } - par.params().clear(); - - par.layout(bparams.getLyXTextClass().defaultLayout()); - + if (!isempty) { + par.params().clear(); + par.layout(bparams.getLyXTextClass().defaultLayout()); + } + // layout stays the same with latex-environments if (flag) { par.layout(tmp->layout());