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

diff --git a/src/ChangeLog b/src/ChangeLog
index f50c4d3816f00dfff9a36113dfecf647c4416ee9..e1cadd9cba9f6db07f293f516ea8dc656297ce65 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-15    <lgb@tandberg.net>
 
+       * 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 7acc817580ded69a589c2cd2adc0185af8ae69fb..2cb63eaa3825d355904e093bd8d80879a1be45d6 100644 (file)
--- 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());